f

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

Author: nic-6443

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

@@ -43,18 +43,18 @@ 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} runtime_version=${APISIX_RUNTIME} 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
           ./build-apisix-dashboard.sh ./apisix
-          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} runtime_version=${APISIX_RUNTIME} 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
+      - name: run ubi9 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
+          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: enable apisix repository in container
         run: |
@@ -63,7 +63,7 @@ jobs:
 
       - 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
@@ -82,7 +82,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
@@ -102,7 +102,7 @@ jobs:
       - 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
+          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

utils/publish-rpm.sh

@@ -140,7 +140,7 @@ repo_clone)
     func_repo_clone "${VAR_COS_BUCKET_REPO}" "redhat" /tmp/redhat
     ;;
 repo_package_sync)
-    find "${VAR_RPM_WORKBENCH_DIR}" -type f -name "*9.6.${ARCH}.rpm" \
+    find "${VAR_RPM_WORKBENCH_DIR}" -type f -name "*ubi9.6.${ARCH}.rpm" \
         -exec echo "repo sync for: {}" \; \
         -exec cp -a {} /tmp/redhat/8/${ARCH} \;
     ;;