Fix settings not being passed to publish action

[noissue]
pulp · Mar 19, 2024 · 5852d38 · 5852d38
1 parent 7ee5191
commit 5852d38
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 4 deletions.
diff --git a/.github/actions/publish_images/action.yml b/.github/actions/publish_images/action.yml
@@ -11,21 +11,36 @@ inputs:
   tags:
     description: 'List of tags the images are to be published under'
     required: true
+  github_token:
+    description: 'Github secret token'
+    required: true
+  docker_bot_username:
+    description: 'Docker username login'
+    required: true
+  docker_bot_password:
+    description: 'Docker password login'
+    required: true
+  quay_bot_username:
+    description: 'Quay username login'
+    required: true
+  quay_bot_password:
+    description: 'Quay password login'
+    required: true
 
 runs:
   using: "composite"
   steps:
     - name: Github login
       env:
-        PULP_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        PULP_GITHUB_TOKEN: ${{ inputs.github_token }}
         PULP_GITHUB_USERNAME: ${{ github.actor }}
       run: echo "$PULP_GITHUB_TOKEN" | podman login -u "$PULP_GITHUB_USERNAME" --password-stdin ghcr.io
       shell: bash
 
     - name: Docker login
       env:
-        DOCKER_BOT_PASSWORD: ${{ secrets.DOCKER_BOT_PASSWORD }}
-        DOCKER_BOT_USERNAME: ${{ secrets.DOCKER_BOT_USERNAME }}
+        DOCKER_BOT_PASSWORD: ${{ inputs.docker_bot_password }}
+        DOCKER_BOT_USERNAME: ${{ inputs.docker_bot_username }}
       run: echo "$DOCKER_BOT_PASSWORD" | podman login -u "$DOCKER_BOT_USERNAME" --password-stdin docker.io
       shell: bash
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -124,7 +124,7 @@ jobs:
           if [ "${{ github.ref_name }}" == "latest" ]; then
             tags="${tags} ${NIGHTLY_VERSION}-${python_version} ${NIGHTLY_BRANCH}-${python_version}"
           fi
-          if [ "${{ inputs.python_version }}" == "3.9" ]; then
+          if [ "${{ env.PYTHON_VERSION }}" == "3.9" ]; then
             tags="${tags} ${PULPCORE_VERSION} ${PULPCORE_BRANCH}"
             if [ "${{ github.ref_name }}" == "latest" ]; then
               tags="${tags} ${NIGHTLY_VERSION} ${NIGHTLY_BRANCH} latest"
@@ -139,6 +139,11 @@ jobs:
           image_names: "base pulp-ci-centos9"
           tags: ${{ env.TAGS }}
           build_tag: ${{ github.ref_name }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          docker_bot_username: ${{ secrets.DOCKER_BOT_USERNAME }}
+          docker_bot_password: ${{ secrets.DOCKER_BOT_PASSWORD }}
+          quay_bot_username: ${{ secrets.QUAY_BOT_USERNAME }}
+          quay_bot_password: ${{ secrets.QUAY_BOT_PASSWORD }}
 
   app-images:
     needs: base-images
@@ -207,6 +212,11 @@ jobs:
           image_names: ${{ env.IMAGES }}
           tags: ${{ env.TAGS }}
           build_tag: ${{ matrix.image_variant == 'nightly' && 'nightly' || github.ref_name }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          docker_bot_username: ${{ secrets.DOCKER_BOT_USERNAME }}
+          docker_bot_password: ${{ secrets.DOCKER_BOT_PASSWORD }}
+          quay_bot_username: ${{ secrets.QUAY_BOT_USERNAME }}
+          quay_bot_password: ${{ secrets.QUAY_BOT_PASSWORD }}
 
       - name: Logs
         if: always()