Release container don't use qpress

MariaDB · Aug 29, 2024 · 3fa7ed2 · 3fa7ed2
1 parent 6640807
commit 3fa7ed2
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 10 deletions.
diff --git a/.github/workflows/bbw_build_container_template.yml b/.github/workflows/bbw_build_container_template.yml
@@ -35,6 +35,10 @@ on:
         required: false
         type: string
         default: 'true'
+      noqpress:
+        required: false
+        type: string
+        default: 'false'
 
 jobs:
   build:
@@ -71,13 +75,19 @@ jobs:
             echo "IMG=${TAG_TMP/:/}" >>$GITHUB_ENV
           fi
           echo "REPO=bb-worker" >>$GITHUB_ENV
-        
+
       - name: Generate Dockerfile and necessary files
         if: ${{ env.MAIN_BRANCH == 'false' }}
         run: |
           cd ${{ env.WORKDIR }}
-          cat ${{ inputs.dockerfile }} qpress.Dockerfile buildbot-worker.Dockerfile >$GITHUB_WORKSPACE/Dockerfile
-          cp -r qpress $GITHUB_WORKSPACE
+
+          if [ "${{ inputs.noqpress }}" == "true" ]; then
+            cat ${{ inputs.dockerfile }} buildbot-worker.Dockerfile >$GITHUB_WORKSPACE/Dockerfile
+          else
+            cat ${{ inputs.dockerfile }} qpress.Dockerfile buildbot-worker.Dockerfile >$GITHUB_WORKSPACE/Dockerfile
+            cp -r qpress $GITHUB_WORKSPACE
+          fi
+
           if [ "${{ inputs.nogalera }}" == true ]; then
             sed -i -e '/ci.mariadb.org\/galera/d' -e '/galera-4/d' -e '/WSREP_PROVIDER/d' $GITHUB_WORKSPACE/Dockerfile
           fi
@@ -149,9 +159,11 @@ jobs:
             docker pull -q --platform "$platform" "$image"
             docker run -i "$image" buildbot-worker --version
             docker run -i "$image" dumb-init twistd --pidfile= -y /home/buildbot/buildbot.tac
-            docker run -u root -i "$image" bash -c "touch /tmp/foo && qpress -r /tmp /root/qpress.qp"
+            if [ "${{ inputs.noqpress }}" == "false" ]; then
+              docker run -u root -i "$image" bash -c "touch /tmp/foo && qpress -r /tmp /root/qpress.qp"
+            fi
           done
-      
+
       - name: Check for registry credentials
         run: |
           missing=()

diff --git a/.github/workflows/build-container-release.yml b/.github/workflows/build-container-release.yml
@@ -10,11 +10,11 @@ on:
       - .github/workflows/bbw_build_container_template.yml
   pull_request:
     paths:
-        - 'ci_build_images/debian-release.Dockerfile'
-        - 'ci_build_images/qpress.Dockerfile'
-        - 'ci_build_images/buildbot-worker.Dockerfile'
-        - .github/workflows/build-container-release.yml
-        - .github/workflows/bbw_build_container_template.yml
+      - 'ci_build_images/debian-release.Dockerfile'
+      - 'ci_build_images/qpress.Dockerfile'
+      - 'ci_build_images/buildbot-worker.Dockerfile'
+      - .github/workflows/build-container-release.yml
+      - .github/workflows/bbw_build_container_template.yml
   workflow_call:
 
 jobs:
@@ -32,4 +32,5 @@ jobs:
       image: ${{ matrix.image }}
       platforms: ${{ matrix.platforms }}
       tag: ${{ matrix.tag }}
+      noqpress: 'true'
     secrets: inherit