chore: upgrade to ubi 9.6 for rpm workflows (#442)

Signed-off-by: Nic <[email protected]>
Co-authored-by: Nic <[email protected]>

Author: LiteSun

.circleci/config.yml

@@ -30,8 +30,7 @@ jobs:
       
       - name: run apisix packaging
         run: |
-          wget https://raw.githubusercontent.com/apache/apisix/${APISIX_VERSION}/.requirements && source .requirements
-          make package type=deb app=apisix version=${PACKAGE_APISIX_VERSION} runtime_version=${APISIX_RUNTIME} checkout=${APISIX_VERSION} image_base=ubuntu image_tag=20.04
+          make package type=deb app=apisix version=${PACKAGE_APISIX_VERSION} checkout=${APISIX_VERSION} image_base=ubuntu image_tag=20.04
 
       - name: install apisix deb into container
         run: |

.github/workflows/package-apisix-deb-ubuntu20.04.yml

@@ -39,27 +39,28 @@ jobs:
 
       - name: packaging APISIX(-remote) with remote code
         run: |
-          wget https://raw.githubusercontent.com/apache/apisix/${APISIX_VERSION}/.requirements && source .requirements
-          make package type=rpm app=apisix version=master checkout=${APISIX_VERSION} runtime_version=${APISIX_RUNTIME} image_base=registry.access.redhat.com/ubi8/ubi image_tag=8.6 artifact=apisix-remote
+          make package type=rpm app=apisix version=master checkout=${APISIX_VERSION} image_base=registry.access.redhat.com/ubi9/ubi image_tag=9.6 artifact=apisix-remote
 
       - name: packaging APISIX(-local) with local code
         run: |
-          wget https://raw.githubusercontent.com/apache/apisix/${APISIX_VERSION}/.requirements && source .requirements
           git clone -b ${APISIX_VERSION} https://github.com/apache/apisix.git
-          make package type=rpm app=apisix version=master checkout=${APISIX_VERSION} runtime_version=${APISIX_RUNTIME} image_base=registry.access.redhat.com/ubi8/ubi image_tag=8.6 local_code_path=./apisix artifact=apisix-local
+          make package type=rpm app=apisix version=master checkout=${APISIX_VERSION} image_base=registry.access.redhat.com/ubi9/ubi image_tag=9.6 local_code_path=./apisix artifact=apisix-local
 
-      - name: run ubi8 docker and mapping rpm into container
-        run: |
-          docker run -itd -v $PWD/output:/output -v $(pwd)/test/apisix/config.yaml:/usr/local/apisix/conf/config.yaml  --name ubiInstance --net="host" registry.access.redhat.com/ubi8/ubi:8.6 /bin/bash
+      - name: Publish Artifact
+        uses: actions/[email protected]
+        with:
+          name: apisix-remote-master-0.ubi9.6.x86_64.rpm
+          path: output/apisix-remote-master-0.ubi9.6.x86_64.rpm
+          retention-days: 5
+          if-no-files-found: error
 
-      - name: enable apisix repository in container
+      - name: run ubi9 docker and mapping rpm into container
         run: |
-          docker exec ubiInstance bash -c "rpm --import https://repos.apiseven.com/KEYS"
-          docker exec ubiInstance bash -c "yum -y install https://repos.apiseven.com/packages/centos/apache-apisix-repo-1.0-1.noarch.rpm"
+          docker run -itd -v $PWD/output:/output -v $(pwd)/test/apisix/config.yaml:/usr/local/apisix/conf/config.yaml  --name ubiInstance --net="host" registry.access.redhat.com/ubi9/ubi:9.6 /bin/bash
 
       - name: install APISIX(-remote) master by rpm in container
         run: |
-          docker exec ubiInstance bash -c "yum -y localinstall /output/apisix-remote-master-0.ubi8.6.x86_64.rpm"
+          docker exec ubiInstance bash -c "yum -y localinstall /output/apisix-remote-master-0.ubi9.6.x86_64.rpm"
           docker exec ubiInstance bash -c "apisix start"
 
       - name: check and ensure APISIX(-remote) master is installed
@@ -78,7 +79,7 @@ jobs:
 
       - name: install APISIX(-local) by rpm in container
         run: |
-          docker exec ubiInstance bash -c "yum -y localinstall /output/apisix-local-master-0.ubi8.6.x86_64.rpm"
+          docker exec ubiInstance bash -c "yum -y localinstall /output/apisix-local-master-0.ubi9.6.x86_64.rpm"
           docker exec ubiInstance bash -c "apisix start"
 
       - name: check and ensure APISIX(-local) is installed
@@ -88,11 +89,3 @@ jobs:
               echo "failed: failed to install Apache APISIX by rpm"
               exit 1
           fi
-
-      - name: Publish Artifact
-        uses: actions/[email protected]
-        with:
-          name: apisix-remote-master-0.ubi8.6.x86_64.rpm
-          path: output/apisix-remote-master-0.ubi8.6.x86_64.rpm
-          retention-days: 5
-          if-no-files-found: error

.github/workflows/package-apisix-rpm-ubi.yml

@@ -27,16 +27,16 @@ jobs:
 
       - name: build apisix-runtime rpm
         run: |
-          make package type=rpm app=apisix-runtime runtime_version=${BUILD_APISIX_RUNTIME_VERSION} image_base=registry.access.redhat.com/ubi8/ubi image_tag=8.6
+          make package type=rpm app=apisix-runtime runtime_version=${BUILD_APISIX_RUNTIME_VERSION} image_base=registry.access.redhat.com/ubi9/ubi image_tag=9.6
 
-      - name: run ubi8 docker and mapping apisix-runtime rpm into container
+      - name: run ubi9 docker and mapping apisix-runtime rpm into container
         run: |
-          docker run -itd -v /home/runner/work/apisix-build-tools/apisix-build-tools/output:/output --name ubiInstance --net="host" registry.access.redhat.com/ubi8/ubi:8.6 /bin/bash
+          docker run -itd -v /home/runner/work/apisix-build-tools/apisix-build-tools/output:/output --name ubiInstance --net="host" registry.access.redhat.com/ubi9/ubi:9.6 /bin/bash
 
       - name: install rpm in container
         run: |
           docker exec ubiInstance bash -c "ls -la /output"
-          docker exec ubiInstance bash -c "yum -y localinstall /output/apisix-runtime-${BUILD_APISIX_RUNTIME_VERSION}-0.ubi8.6.x86_64.rpm"
+          docker exec ubiInstance bash -c "yum -y localinstall /output/apisix-runtime-${BUILD_APISIX_RUNTIME_VERSION}-0.ubi9.6.x86_64.rpm"
 
       - name: check and ensure apisix-runtime is installed
         run: |
@@ -47,7 +47,7 @@ jobs:
       - name: Publish Artifact
         uses: actions/[email protected]
         with:
-          name: apisix-runtime-${{ env.BUILD_APISIX_RUNTIME_VERSION }}-0.ubi8.6.x86_64.rpm
-          path: output/apisix-runtime-${{ env.BUILD_APISIX_RUNTIME_VERSION }}-0.ubi8.6.x86_64.rpm
+          name: apisix-runtime-${{ env.BUILD_APISIX_RUNTIME_VERSION }}-0.ubi9.6.x86_64.rpm
+          path: output/apisix-runtime-${{ env.BUILD_APISIX_RUNTIME_VERSION }}-0.ubi9.6.x86_64.rpm
           retention-days: 5
           if-no-files-found: error