Skip to content

Commit

Permalink
Update CI files
Browse files Browse the repository at this point in the history
[noissue]
  • Loading branch information
pulpbot authored and lubosmj committed Jan 23, 2024
1 parent 12e4a39 commit 4c6dad3
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 32 deletions.
2 changes: 1 addition & 1 deletion .github/template_gitref
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2021.08.26-304-gc53c1e3
2021.08.26-305-g4288910
23 changes: 11 additions & 12 deletions .github/workflows/scripts/script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -129,30 +129,29 @@ echo "Checking for uncommitted migrations..."
cmd_user_prefix bash -c "django-admin makemigrations container --check --dry-run"

# Run unit tests.
cmd_user_prefix bash -c "PULP_DATABASES__default__USER=postgres pytest -v -r sx --color=yes -p no:pulpcore --pyargs pulp_container.tests.unit"
cmd_user_prefix bash -c "PULP_DATABASES__default__USER=postgres pytest -v -r sx --color=yes --suppress-no-test-exit-code -p no:pulpcore --pyargs pulp_container.tests.unit"

# Run functional tests
if [[ "$TEST" == "performance" ]]; then
if [[ -z ${PERFORMANCE_TEST+x} ]]; then
cmd_user_prefix bash -c "pytest -vv -r sx --color=yes --pyargs --capture=no --durations=0 pulp_container.tests.performance"
cmd_user_prefix bash -c "pytest -vv -r sx --color=yes --suppress-no-test-exit-code --capture=no --durations=0 --pyargs pulp_container.tests.performance"
else
cmd_user_prefix bash -c "pytest -vv -r sx --color=yes --pyargs --capture=no --durations=0 pulp_container.tests.performance.test_${PERFORMANCE_TEST}"
cmd_user_prefix bash -c "pytest -vv -r sx --color=yes --suppress-no-test-exit-code --capture=no --durations=0 --pyargs pulp_container.tests.performance.test_${PERFORMANCE_TEST}"
fi
exit
fi

if [ -f "$FUNC_TEST_SCRIPT" ]; then
source "$FUNC_TEST_SCRIPT"
else
if [[ "$GITHUB_WORKFLOW" == "Container Nightly CI/CD" ]]
then
cmd_user_prefix bash -c "pytest -v -r sx --color=yes --suppress-no-test-exit-code --pyargs pulp_container.tests.functional -m parallel -n 8 --nightly"
cmd_user_prefix bash -c "pytest -v -r sx --color=yes --pyargs pulp_container.tests.functional -m 'not parallel' --nightly"

else
cmd_user_prefix bash -c "pytest -v -r sx --color=yes --suppress-no-test-exit-code --pyargs pulp_container.tests.functional -m parallel -n 8"
cmd_user_prefix bash -c "pytest -v -r sx --color=yes --pyargs pulp_container.tests.functional -m 'not parallel'"
fi
if [[ "$GITHUB_WORKFLOW" =~ "Nightly" ]]
then
cmd_user_prefix bash -c "pytest -v -r sx --color=yes --suppress-no-test-exit-code --pyargs pulp_container.tests.functional -m parallel -n 8 --nightly"
cmd_user_prefix bash -c "pytest -v -r sx --color=yes --suppress-no-test-exit-code --pyargs pulp_container.tests.functional -m 'not parallel' --nightly"
else
cmd_user_prefix bash -c "pytest -v -r sx --color=yes --suppress-no-test-exit-code --pyargs pulp_container.tests.functional -m parallel -n 8"
cmd_user_prefix bash -c "pytest -v -r sx --color=yes --suppress-no-test-exit-code --pyargs pulp_container.tests.functional -m 'not parallel'"
fi
fi
pushd ../pulp-cli
pip install -r test_requirements.txt
Expand Down
32 changes: 16 additions & 16 deletions .github/workflows/update_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ jobs:
with:
fetch-depth: 0
path: "pulp_container"
ref: "2.9"
ref: "2.10"

- name: "Run update"
working-directory: "pulp_container"
Expand All @@ -88,10 +88,10 @@ jobs:
path: "pulp_container"
committer: "pulpbot <pulp-infra@redhat.com>"
author: "pulpbot <pulp-infra@redhat.com>"
title: "Update CI files for branch 2.9"
title: "Update CI files for branch 2.10"
body: ""
branch: "update-ci/2.9"
base: "2.9"
branch: "update-ci/2.10"
base: "2.10"
commit-message: |
Update CI files
Expand All @@ -101,7 +101,7 @@ jobs:
with:
fetch-depth: 0
path: "pulp_container"
ref: "2.10"
ref: "2.14"

- name: "Run update"
working-directory: "pulp_container"
Expand All @@ -115,10 +115,10 @@ jobs:
path: "pulp_container"
committer: "pulpbot <pulp-infra@redhat.com>"
author: "pulpbot <pulp-infra@redhat.com>"
title: "Update CI files for branch 2.10"
title: "Update CI files for branch 2.14"
body: ""
branch: "update-ci/2.10"
base: "2.10"
branch: "update-ci/2.14"
base: "2.14"
commit-message: |
Update CI files
Expand All @@ -128,7 +128,7 @@ jobs:
with:
fetch-depth: 0
path: "pulp_container"
ref: "2.14"
ref: "2.15"

- name: "Run update"
working-directory: "pulp_container"
Expand All @@ -142,10 +142,10 @@ jobs:
path: "pulp_container"
committer: "pulpbot <pulp-infra@redhat.com>"
author: "pulpbot <pulp-infra@redhat.com>"
title: "Update CI files for branch 2.14"
title: "Update CI files for branch 2.15"
body: ""
branch: "update-ci/2.14"
base: "2.14"
branch: "update-ci/2.15"
base: "2.15"
commit-message: |
Update CI files
Expand All @@ -155,7 +155,7 @@ jobs:
with:
fetch-depth: 0
path: "pulp_container"
ref: "2.15"
ref: "2.16"

- name: "Run update"
working-directory: "pulp_container"
Expand All @@ -169,10 +169,10 @@ jobs:
path: "pulp_container"
committer: "pulpbot <pulp-infra@redhat.com>"
author: "pulpbot <pulp-infra@redhat.com>"
title: "Update CI files for branch 2.15"
title: "Update CI files for branch 2.16"
body: ""
branch: "update-ci/2.15"
base: "2.15"
branch: "update-ci/2.16"
base: "2.16"
commit-message: |
Update CI files
Expand Down
2 changes: 1 addition & 1 deletion docs/template_gitref
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2021.08.26-304-gc53c1e3
2021.08.26-305-g4288910
3 changes: 1 addition & 2 deletions template_config.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
# This config represents the latest values used when running the plugin-template. Any settings that
# were not present before running plugin-template have been added with their default values.

# generated with plugin_template@2021.08.26-301-g83f0607
# generated with plugin_template@2021.08.26-305-g4288910

additional_repos: []
api_root: /pulp/
black: true
check_commit_message: true
Expand Down

0 comments on commit 4c6dad3

Please sign in to comment.