fix ci

Signed-off-by: kogeler <[email protected]>
paritytech · May 25, 2024 · 0414fdb · 0414fdb
1 parent c8b4b75
commit 0414fdb
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 33 deletions.
diff --git a/.github/workflows/requirements-molecule.txt b/.github/workflows/requirements-molecule.txt
@@ -9,7 +9,6 @@ click==8.1.7
 click-help-colors==0.9.4
 cryptography==42.0.7
 distro==1.9.0
-docker==7.1.0
 enrich==1.2.7
 filelock==3.14.0
 idna==3.7
@@ -32,7 +31,6 @@ pycparser==2.22
 Pygments==2.18.0
 PyYAML==6.0.1
 referencing==0.35.1
-requests==2.31.0
 resolvelib==1.0.1
 rich==13.7.1
 rpds-py==0.18.1
@@ -44,3 +42,10 @@ urllib3==2.2.1
 wcmatch==8.5.2
 yamllint==1.35.1
 zipp==3.18.2
+# requests > 2.31.0 brakes Docker Python library
+# The fix https://github.com/docker/docker-py/pull/3257/files
+# has not been in a release of the Docker Python library
+# they should be updated together
+# when new versions of the Docker Python library > 7.1.0 are released
+docker==7.1.0
+requests==2.31.0
diff --git a/.github/workflows/reusable-molecule.yml b/.github/workflows/reusable-molecule.yml
@@ -32,13 +32,6 @@ jobs:
           fi
         working-directory: "${{ github.repository }}/roles/${{ inputs.role-name }}"
       - name: Install Python modules
-        # version of reauests is fixed because the fix
-        # https://github.com/docker/docker-py/pull/3257/files
-        # has not been in releases yet
-        # it can be removed after updating to the next release of docker-py (now 7.1.0)
-        #          pip3 install --no-cache-dir yamllint ansible==${{ inputs.ansible-version }} ansible-lint==24.5.0  \
-        #          molecule==24.2.1 molecule-plugins[docker]==23.5.3 docker==7.1.0 requests==2.31.0 \
-        #          jmespath==1.0.1
         run: |
           set -e
           echo "ansible==${{ inputs.ansible-version }}" >> requirements-molecule.txt

diff --git a/roles/nginx/molecule/default/README.md b/roles/nginx/molecule/default/README.md
@@ -8,11 +8,3 @@ molecule verify
 molecule destroy
 ```
 
-#### LXD 
-Test role with LXD driver 
-```shell
-DRIVER=lxd molecule create
-DRIVER=lxd molecule converge
-DRIVER=lxd molecule verify
-DRIVER=lxd molecule destroy
-```
diff --git a/roles/nginx/molecule/default/molecule.yml b/roles/nginx/molecule/default/molecule.yml
@@ -5,9 +5,6 @@ driver:
   name: ${DRIVER:-docker}
 platforms:
   - name: molecule-instance-nginx
-    # LXD
-    source:
-      alias: debian/bullseye/amd64
     # DOCKER
     image: paritytech/debian11:latest
     command: ${MOLECULE_DOCKER_COMMAND:-""}

diff --git a/roles/node_backup/molecule/default/README.md b/roles/node_backup/molecule/default/README.md
@@ -15,11 +15,4 @@ molecule converge
 molecule destroy
 ```
 
-#### LXD 
-Test role with LXD driver 
-```shell
-DRIVER=lxd molecule create
-DRIVER=lxd molecule converge
-DRIVER=lxd molecule destroy
-```
 
diff --git a/roles/node_backup/molecule/default/molecule.yml b/roles/node_backup/molecule/default/molecule.yml
@@ -5,9 +5,6 @@ driver:
   name: ${DRIVER:-docker}
 platforms:
   - name: molecule-instance-node-backup
-    # LXD
-    source:
-      alias: debian/bullseye/amd64
     # DOCKER
     image: paritytech/debian11:latest
     command: ${MOLECULE_DOCKER_COMMAND:-""}

diff --git a/roles/ws_health_exporter/molecule/default/molecule.yml b/roles/ws_health_exporter/molecule/default/molecule.yml
@@ -5,9 +5,6 @@ driver:
   name: ${DRIVER:-docker}
 platforms:
   - name: molecule-instance-ws-health-exporter
-    # LXD
-    source:
-      alias: debian/bullseye/amd64
     # DOCKER
     image: paritytech/debian11:latest
     command: ${MOLECULE_DOCKER_COMMAND:-""}