Skip to content

Commit

Permalink
Merge pull request #581 from ccamacho/main
Browse files Browse the repository at this point in the history
ci: update to Ansible 5
  • Loading branch information
gmarcy authored Dec 22, 2021
2 parents 187130b + a798b4a commit 19284cb
Show file tree
Hide file tree
Showing 12 changed files with 31 additions and 33 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/container_image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
strategy:
max-parallel: 4
matrix:
python-version: [3.8]
python-version: [3.9]
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/distro_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
strategy:
max-parallel: 4
matrix:
python-version: [3.8]
python-version: [3.9]
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
Expand All @@ -30,7 +30,7 @@ jobs:
sudo apt install jq -y
sudo apt-get remove ansible -y
sudo python3 -m pip uninstall ansible ansible-base ansible-core -y
sudo python3 -m pip install ansible==3.4.0
sudo python3 -m pip install ansible==5.1.0
sudo locale-gen en_US.UTF-8
sudo dpkg-reconfigure locales
sudo apt install build-essential findutils -y
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
strategy:
max-parallel: 4
matrix:
python-version: [3.8]
python-version: [3.9]
steps:
- name: Use checkout v2 with all git log available
uses: actions/checkout@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/linters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
strategy:
max-parallel: 4
matrix:
python-version: [3.8]
python-version: [3.9]
steps:
- uses: actions/checkout@v2
with:
Expand All @@ -34,7 +34,7 @@ jobs:
sudo apt-get install jq libyaml-dev git build-essential findutils -y
sudo apt-get remove ansible -y
sudo python3 -m pip uninstall ansible ansible-base ansible-core -y
sudo python3 -m pip install ansible==3.4.0
sudo python3 -m pip install ansible==5.1.0
sudo python3 -m pip install --upgrade --ignore-installed PyYAML
sudo python3 -m pip install --upgrade pip
sudo python3 -m pip install --upgrade virtualenv
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
strategy:
max-parallel: 4
matrix:
python-version: [3.8]
python-version: [3.9]
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
Expand All @@ -30,7 +30,7 @@ jobs:
sudo apt install jq -y
sudo apt-get remove ansible -y
sudo python3 -m pip uninstall ansible ansible-base ansible-core -y
sudo python3 -m pip install ansible==3.4.0
sudo python3 -m pip install ansible==5.1.0
sudo locale-gen en_US.UTF-8
sudo dpkg-reconfigure locales
sudo apt install build-essential findutils -y
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
strategy:
max-parallel: 4
matrix:
python-version: [3.8]
python-version: [3.9]
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
Expand All @@ -28,8 +28,8 @@ jobs:
sudo apt update -y
sudo apt install jq -y
sudo apt-get remove ansible -y
sudo python3 -m pip uninstall ansible ansible-core -y
sudo python3 -m pip install ansible==3.4.0
sudo python3 -m pip uninstall ansible ansible-base ansible-core -y
sudo python3 -m pip install ansible==5.1.0
sudo locale-gen en_US.UTF-8
sudo dpkg-reconfigure locales
sudo apt install build-essential findutils -y
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/render_periodic_jobs_status_page.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
strategy:
max-parallel: 4
matrix:
python-version: [3.8]
python-version: [3.9]
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
strategy:
max-parallel: 4
matrix:
python-version: [3.8]
python-version: [3.9]
steps:
- uses: actions/stale@v3
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/units.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
strategy:
max-parallel: 4
matrix:
python-version: [3.8]
python-version: [3.9]
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
Expand All @@ -30,7 +30,7 @@ jobs:
sudo apt install jq -y
sudo apt-get remove ansible -y
sudo python3 -m pip uninstall ansible ansible-base ansible-core -y
sudo python3 -m pip install ansible==3.4.0
sudo python3 -m pip install ansible==5.1.0
sudo locale-gen en_US.UTF-8
sudo dpkg-reconfigure locales
sudo apt install build-essential findutils -y
Expand Down
14 changes: 8 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,23 @@ RUN set -x && \
echo "==> Installing dependencies..." && \
microdnf upgrade -y && microdnf install -y dnf && \
dnf upgrade -y && dnf install -y \
python3 openssh-clients iproute jq && \
python39 python39-pip openssh-clients iproute jq && \
\
echo "==> Setting up ssh options..." && \
mkdir /root/.ssh && \
echo "Host *" >> /root/.ssh/config && \
echo " StrictHostKeyChecking no" >> /root/.ssh/config && \
echo " IdentityFile /root/.ssh/id_rsa" >> /root/.ssh/config && \
\
echo "==> Adding Python runtime and deps..." && \
echo "==> Adding Python runtime and deps..." && \
python3 -m pip install --upgrade --ignore-installed PyYAML && \
python3 -m pip install --upgrade pip && \
python3 -m pip install --upgrade virtualenv && \
python3 -m pip install --upgrade setuptools && \
python3 -m pip install --no-cache-dir --upgrade \
pip \
shyaml \
cryptography==3.3.2 \
ansible==3.4.0 \
netaddr
netaddr && \
python3 -m pip install ansible==5.1.0

COPY . .

Expand Down
10 changes: 4 additions & 6 deletions kubeinit/galaxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,11 @@ tags:
- aws
dependencies:
ansible.posix: '==1.3.0'
# crypto 1.4.0 is the latest without requiring rust
# do not upgrade this unles is strictly necessary
community.crypto: '==1.4.0'
community.general: '==3.8.3'
community.crypto: '==2.0.2'
community.general: '==4.2.0'
community.libvirt: '==1.0.2'
containers.podman: '==1.8.3'
openvswitch.openvswitch: '==2.0.2'
containers.podman: '==1.9.0'
openvswitch.openvswitch: '==2.1.0'
repository: 'https://github.com/kubeinit/kubeinit'
homepage: 'https://www.kubeinit.org'
issues: 'https://github.com/kubeinit/kubeinit/issues'
10 changes: 4 additions & 6 deletions kubeinit/requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,13 @@
collections:
- name: ansible.posix
version: '1.3.0'
# crypto 1.4.0 is the latest without requiring rust
# do not upgrade this unles is strictly necessary
- name: community.crypto
version: '1.4.0'
version: '2.0.2'
- name: community.general
version: '3.8.3'
version: '4.2.0'
- name: community.libvirt
version: '1.0.2'
- name: containers.podman
version: '1.8.3'
version: '1.9.0'
- name: openvswitch.openvswitch
version: '2.0.2'
version: '2.1.0'

0 comments on commit 19284cb

Please sign in to comment.