simplify unit testing. (#2291)

Switch from playbooks and pulp images to using simple tox for unit testing. No-Issue Signed-off-by: James Tanner <[email protected]>
ansible · Oct 9, 2024 · ff2f1d8 · ff2f1d8
1 parent 18d8f6c
commit ff2f1d8
Show file tree

Hide file tree

Showing 28 changed files with 100 additions and 865 deletions.
diff --git a/.github/workflows/ci_full.yml b/.github/workflows/ci_full.yml
@@ -18,9 +18,13 @@ jobs:
  ref: ${{ github.event.after }} # for PR avoids checking out merge commit
  fetch-depth: 0 # include all history
 
- - name: intsall and run lint-po
+ - uses: actions/setup-python@v4
+ with:
+ python-version: "3.11"
+
+ - name: install and run lint-po
  run: |
- pip install lint-po
+ pip3 install lint-po
  lint-po ./galaxy_ng/locale/*/LC_MESSAGES/*.po
 
  lint:
@@ -62,30 +66,27 @@ jobs:
 
  - uses: actions/checkout@v4
 
- - name: install ansible
- run: pip3 install ansible
-
- - name: install python-requests
- run: pip3 install requests
-
- - name: run the build container playbook
- run: cd dev/playbooks; ANSIBLE_STDOUT_CALLBACK=yaml ansible-playbook -i 'localhost,' --forks=1 -v build_container.yaml
+ - name: checkout dab
+ run: |
+ cd ..
+ git clone https://github.com/ansible/django-ansible-base
 
- - name: run the start container playbook
- run: cd dev/playbooks; ANSIBLE_STDOUT_CALLBACK=yaml ansible-playbook -i 'localhost,' --forks=1 -v start_container.yaml
+ - name: install system dependencies
+ run: |
+ sudo apt update
+ sudo apt install -y libsasl2-dev libldap2-dev libssl-dev gettext
 
- - name: run the unit test playbook
- run: cd dev/playbooks; ANSIBLE_STDOUT_CALLBACK=yaml ansible-playbook -i 'localhost,' --forks=1 -v run_unit_tests.yaml
+ - name: install tox & coverage
+ run: pip3 install tox coverage
 
- - name: copy coverage report
- run: |
- docker cp pulp:/tmp/galaxy_ng-test-results.xml coverage.xml
+ - name: run the unit tests
+ run: tox -e py311
 
  - name: upload coverage as artifact
  uses: actions/upload-artifact@v4
  with:
  name: coverage
- path: coverage.xml
+ path: /tmp/galaxy_ng-test-results.xml
 
  - name: SonarCloud Scan
  uses: SonarSource/sonarcloud-github-action@master

diff --git a/aap_compose_dev.yaml b/aap_compose_dev.yaml
@@ -72,12 +72,15 @@ services:
 
  postgres:
  image: "postgres:13"
+ ports:
+ - '5433:5432'
  environment:
  <<: *common-env
  healthcheck:
  test: ["CMD", "pg_isready", "-U", "galaxy_ng"]
  interval: 10s
  retries: 5
+ command: ["postgres", "-c", "log_statement=all", "-c", "log_destination=stderr"]
 
  helper:
  image: quay.io/centos/centos:stream9
@@ -230,4 +233,4 @@ volumes:
 
 networks:
  service-mesh:
- name: service-mesh
+ name: service-mesh
diff --git a/dev/playbooks/RUNALL.sh b/dev/playbooks/RUNALL.sh
diff --git a/dev/playbooks/build_container.yaml b/dev/playbooks/build_container.yaml
diff --git a/dev/playbooks/collections/ansible_collections/galaxy_ng/tools/galaxy.yml b/dev/playbooks/collections/ansible_collections/galaxy_ng/tools/galaxy.yml
diff --git a/dev/playbooks/collections/ansible_collections/galaxy_ng/tools/plugins/action/local_run.py b/dev/playbooks/collections/ansible_collections/galaxy_ng/tools/plugins/action/local_run.py
diff --git a/dev/playbooks/collections/ansible_collections/galaxy_ng/tools/plugins/filter/repr.py b/dev/playbooks/collections/ansible_collections/galaxy_ng/tools/plugins/filter/repr.py
diff --git a/...books/collections/ansible_collections/galaxy_ng/tools/roles/pulp_client/files/generate.sh b/...books/collections/ansible_collections/galaxy_ng/tools/roles/pulp_client/files/generate.sh
diff --git a/...laybooks/collections/ansible_collections/galaxy_ng/tools/roles/pulp_client/tasks/main.yml b/...laybooks/collections/ansible_collections/galaxy_ng/tools/roles/pulp_client/tasks/main.yml
diff --git a/...playbooks/collections/ansible_collections/galaxy_ng/tools/roles/pulp_smash/tasks/main.yml b/...playbooks/collections/ansible_collections/galaxy_ng/tools/roles/pulp_smash/tasks/main.yml
diff --git a/dev/playbooks/docker/BUILD.sh b/dev/playbooks/docker/BUILD.sh
diff --git a/dev/playbooks/docker/packages.patch b/dev/playbooks/docker/packages.patch