From a798b4a63b99fa97ee4956c886538188f690da70 Mon Sep 17 00:00:00 2001 From: Carlos Camacho Date: Tue, 21 Dec 2021 16:46:57 +0100 Subject: [PATCH] ci: update to Ansible 5 This commit tests Ansible 5 in the release script. --- .github/workflows/container_image.yml | 2 +- .github/workflows/distro_test.yml | 4 ++-- .github/workflows/docs_build.yml | 2 +- .github/workflows/linters.yml | 4 ++-- .github/workflows/molecule.yml | 4 ++-- .github/workflows/release.yml | 6 +++--- .../workflows/render_periodic_jobs_status_page.yml | 2 +- .github/workflows/stale.yml | 2 +- .github/workflows/units.yml | 4 ++-- Dockerfile | 14 ++++++++------ kubeinit/galaxy.yml | 10 ++++------ kubeinit/requirements.yml | 10 ++++------ 12 files changed, 31 insertions(+), 33 deletions(-) diff --git a/.github/workflows/container_image.yml b/.github/workflows/container_image.yml index bbcc45fd1..1d9c8ef74 100644 --- a/.github/workflows/container_image.yml +++ b/.github/workflows/container_image.yml @@ -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 }} diff --git a/.github/workflows/distro_test.yml b/.github/workflows/distro_test.yml index 3459a6ad9..f787204c4 100644 --- a/.github/workflows/distro_test.yml +++ b/.github/workflows/distro_test.yml @@ -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 }} @@ -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 diff --git a/.github/workflows/docs_build.yml b/.github/workflows/docs_build.yml index 54fef96d6..a7798575f 100644 --- a/.github/workflows/docs_build.yml +++ b/.github/workflows/docs_build.yml @@ -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 diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml index 0bdfb3321..34e3d9ad4 100644 --- a/.github/workflows/linters.yml +++ b/.github/workflows/linters.yml @@ -17,7 +17,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: [3.8] + python-version: [3.9] steps: - uses: actions/checkout@v2 with: @@ -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 diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml index 138697260..36e5af0cc 100644 --- a/.github/workflows/molecule.yml +++ b/.github/workflows/molecule.yml @@ -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 }} @@ -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 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b5f89d153..408c5da25 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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 }} @@ -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 diff --git a/.github/workflows/render_periodic_jobs_status_page.yml b/.github/workflows/render_periodic_jobs_status_page.yml index 93e87d816..82c5189ed 100644 --- a/.github/workflows/render_periodic_jobs_status_page.yml +++ b/.github/workflows/render_periodic_jobs_status_page.yml @@ -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 }} diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 53ae3c3e6..dd5a5c0f1 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -9,7 +9,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: [3.8] + python-version: [3.9] steps: - uses: actions/stale@v3 with: diff --git a/.github/workflows/units.yml b/.github/workflows/units.yml index 62f5825ad..c01eff24a 100644 --- a/.github/workflows/units.yml +++ b/.github/workflows/units.yml @@ -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 }} @@ -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 diff --git a/Dockerfile b/Dockerfile index 8b3a08aa2..2375271b7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ 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 && \ @@ -18,13 +18,15 @@ RUN set -x && \ 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 . . diff --git a/kubeinit/galaxy.yml b/kubeinit/galaxy.yml index 369ccbb34..a418ff08c 100644 --- a/kubeinit/galaxy.yml +++ b/kubeinit/galaxy.yml @@ -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' diff --git a/kubeinit/requirements.yml b/kubeinit/requirements.yml index bc8daa428..4fab0f9cd 100644 --- a/kubeinit/requirements.yml +++ b/kubeinit/requirements.yml @@ -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'