Merge pull request #39 from CoffeeITWorks/hotfix/github_actions_tests

fixes on dependencies and molecule-podman tests
CoffeeITWorks · Oct 13, 2023 · aecb635 · aecb635
2 parents 6407c8e + ab233cd
commit aecb635
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 5 deletions.
diff --git a/.github/workflows/galaxy-notify.yml b/.github/workflows/galaxy-notify.yml
@@ -16,8 +16,8 @@ jobs:
       matrix:
         # Better to use one scenario per OS for faster performance and easier debugging
         scenario:
-          - ubuntu-2204
-          - rocky9
+          - local-stable
+          - local-rocky9
     steps:
 
       - name: Checkout
@@ -33,7 +33,7 @@ jobs:
       - name: Install dependencies.
         run: |
           python3 -m pip install --upgrade pip
-          python3 -m pip install yamllint ansible-lint ansible "molecule[lint,docker]"
+          python3 -m pip install yamllint ansible-lint ansible molecule-podman
       
       - name: Install Galaxy dependencies.
         run: ansible-galaxy collection install community.docker

diff --git a/.github/workflows/molecule-test.yml b/.github/workflows/molecule-test.yml
@@ -37,7 +37,7 @@ jobs:
       - name: Install dependencies.
         run: |
           python3 -m pip install --upgrade pip
-          python3 -m pip install yamllint ansible-lint ansible molecule molecule-plugins[podman] podman
+          python3 -m pip install yamllint ansible-lint ansible molecule-podman
 
       # https://www.linkedin.com/pulse/how-run-rootless-podman-service-github-actions-%D0%B4%D0%BC%D0%B8%D1%82%D1%80%D0%B8%D0%B9-%D0%BC%D0%B8%D1%88%D0%B0%D1%80%D0%BE%D0%B2
       - name: Prepare the environment for podman

diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,7 @@
+2.2.1
+* important fix for werkzeug dependency
+* minor fixes on molecule-podman
+
 2.2.0
 * fix for #28 issues with dependencies and python 3.10
 * python3 only supported

diff --git a/defaults/main.yml b/defaults/main.yml
@@ -221,4 +221,7 @@ burpui_pip_present:
   - "requests[security]>=2.12"  # required to avoid issues with get_url module
   #- "normalizer==0.2.1"
 
+burpui_pip_fixed_deps:
+  - werkzeug==2.3.7 # Fix issue with ImportError: cannot import name 'url_quote' from 'werkzeug.urls'
+
 ##### --------------------------- #####
diff --git a/handlers/main.yml b/handlers/main.yml
@@ -12,7 +12,7 @@
   notify: wait burpui
 
 - name: restart bui-celery
-  supervisorctl:
+  service:
     name: bui-celery
     state: restarted
   when: not bui_use_systemd

diff --git a/tasks/python3_pip.yml b/tasks/python3_pip.yml
@@ -64,3 +64,10 @@
     mode: '0755'
     state: link
   with_items: "{{ burpui_bin_links }}"
+
+- name: pip3 | Install pip fixes packages
+  pip:
+    name: "{{ burpui_pip_fixed_deps }}"
+    state: present
+    virtualenv: "{{ burpui_virtualenv }}"
+    virtualenv_command: "{{ burpui_virtualenv_command }}"