Update CI files

[noissue]
pulp · May 19, 2024 · e029b00 · e029b00
1 parent c3f2047
commit e029b00
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 10 deletions.
diff --git a/.github/template_gitref b/.github/template_gitref
@@ -1 +1 @@
-2021.08.26-330-g0b7d0c1
+2021.08.26-333-gdf1d3ba
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -42,3 +42,4 @@ jobs:
           path: "pulp_python/dist/"
           if-no-files-found: "error"
           retention-days: 5
+          overwrite: true
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -88,25 +88,32 @@ jobs:
         run: |
           .github/workflows/scripts/install_ruby_client.sh
         shell: "bash"
+
       - name: "Upload python client packages"
         uses: "actions/upload-artifact@v4"
         with:
           name: "python-client.tar"
-          path: "pulp_python/python-python-client.tar"
+          path: |
+            pulp_python/python-python-client.tar
           if-no-files-found: "error"
+          overwrite: true
 
       - name: "Upload python client docs"
         uses: "actions/upload-artifact@v4"
         with:
           name: "python-client-docs.tar"
-          path: "pulp_python/python-python-client-docs.tar"
+          path: |
+            pulp_python/python-python-client-docs.tar
           if-no-files-found: "error"
+          overwrite: true
       - name: "Upload ruby client packages"
         uses: "actions/upload-artifact@v4"
         with:
           name: "ruby-client.tar"
-          path: "pulp_python/python-ruby-client.tar"
+          path: |
+            pulp_python/python-ruby-client.tar
           if-no-files-found: "error"
+          overwrite: true
       - name: Build docs
         run: |
           export DJANGO_SETTINGS_MODULE=pulpcore.app.settings
@@ -119,6 +126,8 @@ jobs:
         with:
           name: "docs.tar"
           path: "pulp_python/docs/docs.tar"
+          if-no-files-found: "error"
+          overwrite: true
 
       - name: "Logs"
         if: always()

diff --git a/.github/workflows/scripts/install.sh b/.github/workflows/scripts/install.sh
@@ -147,6 +147,7 @@ sudo chown -R 700:700 ~/.config
 echo ::group::SSL
 # Copy pulp CA
 sudo docker cp pulp:/etc/pulp/certs/pulp_webserver.crt /usr/local/share/ca-certificates/pulp_webserver.crt
+sudo docker exec -u root pulp trust anchor /etc/pulp/certs/pulp_webserver.crt
 
 # Hack: adding pulp CA to certifi.where()
 CERTIFI=$(python -c 'import certifi; print(certifi.where())')
@@ -175,6 +176,7 @@ if [[ "$TEST" = "azure" ]]; then
   cat /usr/local/share/ca-certificates/azcert.crt >> $AZCERTIFI
   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
+  cmd_stdin_prefix sudo trust anchor /etc/pki/tls/cert.pem
   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
 fi

diff --git a/.github/workflows/scripts/publish_client_pypi.sh b/.github/workflows/scripts/publish_client_pypi.sh
@@ -24,10 +24,8 @@ RESPONSE="$(curl --write-out '%{http_code}' --silent --output /dev/null "https:/
 if [ "$RESPONSE" == "200" ];
 then
   echo "pulp_python client $VERSION has already been released. Skipping."
-  exit
+else
+  twine upload -u __token__ -p "$PYPI_API_TOKEN" \
+  "dist/pulp_python_client-$VERSION-py3-none-any.whl" \
+  "dist/pulp_python-client-$VERSION.tar.gz"
 fi
-
-twine upload -u __token__ -p "$PYPI_API_TOKEN" \
-"dist/pulp_python_client-$VERSION-py3-none-any.whl" \
-"dist/pulp_python-client-$VERSION.tar.gz" \
-;
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -125,6 +125,7 @@ jobs:
           path: "pulp_python/deprecations-${{ matrix.env.TEST }}.txt"
           if-no-files-found: "error"
           retention-days: 5
+          overwrite: true
       - name: Upload python client packages
         if: ${{ env.TEST == 'pulp' }}
         uses: actions/upload-artifact@v4
@@ -133,6 +134,7 @@ jobs:
           path: "pulp_python/python-python-client.tar"
           if-no-files-found: "error"
           retention-days: 5
+          overwrite: true
 
       - name: Upload python client docs
         if: ${{ env.TEST == 'pulp' }}
@@ -142,6 +144,7 @@ jobs:
           path: "pulp_python/python-python-client-docs.tar"
           if-no-files-found: "error"
           retention-days: 5
+          overwrite: true
       - name: Upload Ruby client
         if: ${{ env.TEST == 'pulp' }}
         uses: actions/upload-artifact@v4
@@ -150,12 +153,16 @@ jobs:
           path: "pulp_python/python-ruby-client.tar"
           if-no-files-found: "error"
           retention-days: 5
+          overwrite: true
       - name: Upload built docs
         if: ${{ env.TEST == 'docs' }}
         uses: actions/upload-artifact@v4
         with:
           name: "docs.tar"
           path: "pulp_python/docs/docs.tar"
+          if-no-files-found: "error"
+          retention-days: 5
+          overwrite: true
 
       - name: "Logs"
         if: always()