From eacc37e4a90e39345ad24512f7be1526cb042736 Mon Sep 17 00:00:00 2001 From: pulpbot Date: Sun, 18 Feb 2024 02:36:56 +0000 Subject: [PATCH] Update CI files [noissue] --- .github/template_gitref | 2 +- .github/workflows/build.yml | 2 +- .github/workflows/changelog.yml | 2 +- .github/workflows/ci.yml | 2 +- .github/workflows/create-branch.yml | 2 +- .github/workflows/lint.yml | 2 +- .github/workflows/nightly.yml | 2 +- .github/workflows/publish.yml | 8 ++++---- .github/workflows/release.yml | 2 +- .github/workflows/scripts/install.sh | 9 ++++++++- .github/workflows/test.yml | 2 +- .github/workflows/update-labels.yml | 2 +- .github/workflows/update_ci.yml | 2 +- docs/template_gitref | 2 +- template_config.yml | 3 +-- 15 files changed, 25 insertions(+), 19 deletions(-) diff --git a/.github/template_gitref b/.github/template_gitref index 2b533f2f5..e456a48e1 100644 --- a/.github/template_gitref +++ b/.github/template_gitref @@ -1 +1 @@ -2021.08.26-315-g8ecb63d +2021.08.26-316-g69ef1f6 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 45dcc63c3..4009b915b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,7 +25,7 @@ jobs: path: "pulp_container" - uses: "actions/setup-python@v4" with: - python-version: "3.8" + python-version: "3.11" - name: "Install python dependencies" run: | echo ::group::PYDEPS diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index a70ba631d..f3532e4ce 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -30,7 +30,7 @@ jobs: - uses: "actions/setup-python@v4" with: - python-version: "3.8" + python-version: "3.11" - name: "Install python dependencies" run: | diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 20b7dffb6..f52c0be94 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,7 +27,7 @@ jobs: path: "pulp_container" - uses: "actions/setup-python@v4" with: - python-version: "3.8" + python-version: "3.11" - name: "Install python dependencies" run: | echo ::group::PYDEPS diff --git a/.github/workflows/create-branch.yml b/.github/workflows/create-branch.yml index cdebcfa5d..da6074c9a 100644 --- a/.github/workflows/create-branch.yml +++ b/.github/workflows/create-branch.yml @@ -28,7 +28,7 @@ jobs: - uses: "actions/setup-python@v4" with: - python-version: "3.8" + python-version: "3.11" - name: "Install python dependencies" run: | diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index bb2b3ba8e..9b5357331 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -26,7 +26,7 @@ jobs: - uses: "actions/setup-python@v4" with: - python-version: "3.8" + python-version: "3.11" - name: "Install python dependencies" run: | diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 071d97846..82c068e82 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -83,7 +83,7 @@ jobs: - uses: "actions/setup-python@v4" with: - python-version: "3.8" + python-version: "3.11" - name: "Install python dependencies" run: | diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index b17c5df53..8dbfc4d2f 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -41,7 +41,7 @@ jobs: - uses: "actions/setup-python@v4" with: - python-version: "3.8" + python-version: "3.11" - uses: "actions/download-artifact@v3" with: @@ -152,7 +152,7 @@ jobs: - uses: "actions/setup-python@v4" with: - python-version: "3.8" + python-version: "3.11" - name: "Install python dependencies" run: | @@ -195,7 +195,7 @@ jobs: - uses: "actions/setup-python@v4" with: - python-version: "3.8" + python-version: "3.11" - name: "Install python dependencies" run: | @@ -265,7 +265,7 @@ jobs: - uses: "actions/setup-python@v4" with: - python-version: "3.8" + python-version: "3.11" - name: "Install python dependencies" run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 32033f1c6..be1d16849 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -30,7 +30,7 @@ jobs: - uses: "actions/setup-python@v4" with: - python-version: "3.8" + python-version: "3.11" - name: "Install python dependencies" run: | diff --git a/.github/workflows/scripts/install.sh b/.github/workflows/scripts/install.sh index 8456cf851..65852523b 100755 --- a/.github/workflows/scripts/install.sh +++ b/.github/workflows/scripts/install.sh @@ -162,10 +162,17 @@ cat "$CERTIFI" | sudo tee -a "$CERT" > /dev/null sudo update-ca-certificates echo ::endgroup:: +# Add our azcert.crt certificate to the container image along with the certificates from certifi +# so that we can use HTTPS with our fake Azure CI. certifi is self-contained and doesn't allow +# extension or modification of the trust store, so we do a weird and hacky thing (above) where we just +# overwrite or append to certifi's trust store behind it's back. +# +# We do this for both the CI host and the CI image. if [[ "$TEST" = "azure" ]]; then AZCERTIFI=$(/opt/az/bin/python3 -c 'import certifi; print(certifi.where())') + PULPCERTIFI=$(cmd_prefix python3 -c 'import certifi; print(certifi.where())') cat /usr/local/share/ca-certificates/azcert.crt >> $AZCERTIFI - cat /usr/local/share/ca-certificates/azcert.crt | cmd_stdin_prefix tee -a /usr/local/lib/python3.8/site-packages/certifi/cacert.pem > /dev/null + cat /usr/local/share/ca-certificates/azcert.crt | cmd_stdin_prefix tee -a "$PULPCERTIFI" > /dev/null cat /usr/local/share/ca-certificates/azcert.crt | cmd_stdin_prefix tee -a /etc/pki/tls/cert.pem > /dev/null AZURE_STORAGE_CONNECTION_STRING='DefaultEndpointsProtocol=https;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=https://ci-azurite:10000/devstoreaccount1;' az storage container create --name pulp-test --connection-string $AZURE_STORAGE_CONNECTION_STRING diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 73e3dff6b..853d535f0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -41,7 +41,7 @@ jobs: - uses: "actions/setup-python@v4" with: - python-version: "3.8" + python-version: "3.11" - uses: "actions/download-artifact@v3" with: diff --git a/.github/workflows/update-labels.yml b/.github/workflows/update-labels.yml index e300fc362..2afc8915c 100644 --- a/.github/workflows/update-labels.yml +++ b/.github/workflows/update-labels.yml @@ -21,7 +21,7 @@ jobs: steps: - uses: "actions/setup-python@v4" with: - python-version: "3.8" + python-version: "3.11" - name: "Configure Git with pulpbot name and email" run: | git config --global user.name 'pulpbot' diff --git a/.github/workflows/update_ci.yml b/.github/workflows/update_ci.yml index a0479edfc..1b0318f96 100644 --- a/.github/workflows/update_ci.yml +++ b/.github/workflows/update_ci.yml @@ -31,7 +31,7 @@ jobs: - uses: "actions/setup-python@v4" with: - python-version: "3.8" + python-version: "3.11" - name: "Install python dependencies" run: | diff --git a/docs/template_gitref b/docs/template_gitref index 2b533f2f5..e456a48e1 100644 --- a/docs/template_gitref +++ b/docs/template_gitref @@ -1 +1 @@ -2021.08.26-315-g8ecb63d +2021.08.26-316-g69ef1f6 diff --git a/template_config.yml b/template_config.yml index 3dc3a7d09..12de77e08 100644 --- a/template_config.yml +++ b/template_config.yml @@ -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 plugin_template@2021.08.26-315-g8ecb63d +# generated with plugin_template@2021.08.26-316-g69ef1f6 api_root: /pulp/ black: true @@ -66,7 +66,6 @@ pulp_settings_s3: flatpak_index: false pulpprojectdotorg_key_id: aa499d7938ed pydocstyle: true -python_version: '3.8' release_email: pulp-infra@redhat.com release_user: pulpbot stalebot: true