Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixes on dependencies and molecule-podman tests #39

Merged
merged 4 commits into from
Oct 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/galaxy-notify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/molecule-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 3 additions & 0 deletions defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'

##### --------------------------- #####
2 changes: 1 addition & 1 deletion handlers/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
notify: wait burpui

- name: restart bui-celery
supervisorctl:
service:
name: bui-celery
state: restarted
when: not bui_use_systemd
Expand Down
7 changes: 7 additions & 0 deletions tasks/python3_pip.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Loading