Skip to content

Commit

Permalink
Update CI (#1106)
Browse files Browse the repository at this point in the history
No-Issue
  • Loading branch information
fao89 authored Jan 31, 2022
1 parent 021ac7e commit df39958
Show file tree
Hide file tree
Showing 8 changed files with 46 additions and 70 deletions.
2 changes: 1 addition & 1 deletion .ci/ansible/Containerfile.j2
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM {{ ci_base | default("pulp/pulp-ci-centos:" + pulp_container_tag) }}
FROM {{ ci_base | default("ghcr.io/pulp/pulp-ci-centos:" + pulp_container_tag) }}

# Add source directories to container
{% for item in plugins %}
Expand Down
3 changes: 3 additions & 0 deletions .ci/ansible/settings.py.j2
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ PRIVATE_KEY_PATH = "/etc/pulp/certs/token_private_key.pem"
PUBLIC_KEY_PATH = "/etc/pulp/certs/token_public_key.pem"
TOKEN_SERVER = "{{ pulp_scheme }}://pulp:{{ 443 if pulp_scheme == 'https' else 80 }}/token/"
TOKEN_SIGNATURE_ALGORITHM = "ES256"
CACHE_ENABLED = True
REDIS_HOST = "localhost"
REDIS_PORT = 6379

{% if pulp_settings %}
{% for key, value in pulp_settings.items() %}
Expand Down
2 changes: 1 addition & 1 deletion .github/template_gitref
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2021.08.26-52-gf91faee
2021.08.26-65-g3505809
9 changes: 8 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,10 @@ jobs:
- TEST: pulp
- TEST: azure
- TEST: s3
outputs:
deprecations-pulp: ${{ steps.deprecations.outputs.deprecations-pulp }}
deprecations-azure: ${{ steps.deprecations.outputs.deprecations-azure }}
deprecations-s3: ${{ steps.deprecations.outputs.deprecations-s3 }}

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -180,6 +184,10 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_CONTEXT: ${{ github.event.pull_request.commits_url }}

- name: Extract Deprecations from Logs
id: deprecations
run: echo "::set-output name=deprecations-${{ matrix.env.TEST }}::$(docker logs pulp 2>&1 | grep -i pulpcore.deprecation | base64 -w 0)"

- name: Logs
if: always()
run: |
Expand All @@ -192,7 +200,6 @@ jobs:
docker exec pulp cat /etc/yum.repos.d/* || true
docker exec pulp pip3 list
update_manifest:
runs-on: ubuntu-latest
Expand Down
25 changes: 25 additions & 0 deletions .github/workflows/nightly_latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ jobs:
- TEST: pulp
- TEST: azure
- TEST: s3
outputs:
deprecations-pulp: ${{ steps.deprecations.outputs.deprecations-pulp }}
deprecations-azure: ${{ steps.deprecations.outputs.deprecations-azure }}
deprecations-s3: ${{ steps.deprecations.outputs.deprecations-s3 }}

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -117,6 +121,10 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_CONTEXT: ${{ github.event.pull_request.commits_url }}

- name: Extract Deprecations from Logs
id: deprecations
run: echo "::set-output name=deprecations-${{ matrix.env.TEST }}::$(docker logs pulp 2>&1 | grep -i pulpcore.deprecation | base64 -w 0)"

- name: Logs
if: always()
run: |
Expand All @@ -128,3 +136,20 @@ jobs:
docker exec pulp ls -latr /etc/yum.repos.d/ || true
docker exec pulp cat /etc/yum.repos.d/* || true
docker exec pulp pip3 list
deprecations:
runs-on: ubuntu-latest
if: always()
needs: test
steps:
- name: Fail on deprecations
run: |
test -z "${{ needs.test.outputs.deprecations-pulp }}"
test -z "${{ needs.test.outputs.deprecations-azure }}"
test -z "${{ needs.test.outputs.deprecations-s3 }}"
- name: Print deprecations
if: failure()
run: |
echo "${{ needs.test.outputs.deprecations-pulp }}" | base64 -d
echo "${{ needs.test.outputs.deprecations-azure }}" | base64 -d
echo "${{ needs.test.outputs.deprecations-s3 }}" | base64 -d
5 changes: 4 additions & 1 deletion .github/workflows/scripts/script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,10 @@ fi
if [ -f $FUNC_TEST_SCRIPT ]; then
source $FUNC_TEST_SCRIPT
else
pytest -v -r sx --color=yes --pyargs galaxy_ng.tests.functional

pytest -v -r sx --color=yes --suppress-no-test-exit-code --pyargs galaxy_ng.tests.functional -m parallel -n 8
pytest -v -r sx --color=yes --pyargs galaxy_ng.tests.functional -m "not parallel"

fi

if [ -f $POST_SCRIPT ]; then
Expand Down
64 changes: 0 additions & 64 deletions .github/workflows/scripts/stage-changelog-for-master.py

This file was deleted.

6 changes: 4 additions & 2 deletions template_config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# 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 [email protected]47-g98a48cc
# generated with [email protected]65-g3505809

additional_repos:
- bindings: true
Expand Down Expand Up @@ -43,6 +43,7 @@ docs_test: false
flake8: true
issue_tracker: null
noissue_marker: No-Issue
parallel_test_workers: 8
plugin_app_label: galaxy
plugin_camel: GalaxyNG
plugin_camel_short: Galaxy
Expand Down Expand Up @@ -85,11 +86,12 @@ tasking_allow_async_unsafe: true
test_azure: true
test_bindings: false
test_cli: false
test_deprecations: false
test_performance: false
test_released_plugin_with_next_pulpcore_release: false
test_s3: true
travis_addtl_services: []
travis_notifications: null
update_redmine: false
update_github: false
upgrade_range: []

0 comments on commit df39958

Please sign in to comment.