feat: add ci repo support (#189)

feat: add ci repo support

Author: leslie-tsang

.github/workflows/publish.yml

@@ -13,8 +13,9 @@ jobs:
     runs-on: ubuntu-18.04
     timeout-minutes: 60
     env:
-      VAR_ALIYUN_OSS_BUCKET: ${{ secrets.VAR_ALIYUN_OSS_BUCKET }}
-      VAR_ALIYUN_OSS_ENDPOINT: ${{ secrets.VAR_ALIYUN_OSS_ENDPOINT }}
+      VAR_OSS_BUCKET_CI: ${{ secrets.VAR_OSS_BUCKET_CI }}
+      VAR_OSS_BUCKET_REPO: ${{ secrets.VAR_OSS_BUCKET_REPO }}
+      VAR_OSS_ENDPOINT: ${{ secrets.VAR_OSS_ENDPOINT }}
       VAR_RPM_WORKBENCH_DIR: /tmp/output
 
     steps:
@@ -117,8 +118,8 @@ jobs:
 
       - name: RPM repo package update
         env:
-          GPG_NAME: "APISIX Publisher"
-          GPG_MAIL: "<[email protected]>"
+          GPG_NAME: ${{ secrets.GPG_NAME }}
+          GPG_MAIL: ${{ secrets.GPG_MAIL }}
         run: |
           echo "${{ secrets.RPM_GPG_PRIV_KEY }}" >> /tmp/rpm-gpg-publish.private
           echo "${{ secrets.RPM_GPG_PASSPHRASE }}" >> /tmp/rpm-gpg-publish.passphrase
@@ -135,6 +136,10 @@ jobs:
           sudo -E ./utils/publish-rpm.sh repo_repodata_rebuild
           sudo -E ./utils/publish-rpm.sh repo_upload
 
-      - name: RPM repo remove backup
+      - name: RPM repo verify
         run: |
-          sudo -E ./utils/publish-rpm.sh repo_backup_remove
+          echo "verify"
+
+      - name: RPM repo publish
+        run: |
+          sudo -E ./utils/publish-rpm.sh repo_publish

utils/publish-rpm.sh

@@ -8,7 +8,6 @@ set -x
 # Runtime default config
 # =======================================
 VAR_ALIYUN_OSS_UTILS_VERSION=${VAR_ALIYUN_OSS_UTILS_VERSION:-1.7.10}
-VAR_ALIYUN_OSS_ENDPOINT=${VAR_ALIYUN_OSS_ENDPOINT:-endpoint=oss-cn-shenzhen.aliyuncs.com}
 VAR_RPM_WORKBENCH_DIR=${VAR_RPM_WORKBENCH_DIR:-/tmp/output}
 VAR_GPG_PRIV_KET=${VAR_GPG_PRIV_KET:-/tmp/rpm-gpg-publish.private}
 VAR_GPG_PASSPHRASE=${VAR_GPG_PASSPHRASE:-/tmp/rpm-gpg-publish.passphrase}
@@ -111,6 +110,14 @@ func_repo_upload() {
     ossutil64 cp -r "${1}" "oss://${2}/packages/${3}"
 }
 
+func_repo_publish() {
+    # ${1} - CI bucket
+    # ${2} - repo publish bucket
+    # ${3} - OSS path
+    ossutil64 rm -r -f "oss://${2}/packages/${3}"
+    ossutil64 cp -r "oss://${1}/packages/${3}" "oss://${2}/packages"
+}
+
 # =======================================
 # publish utils entry
 # =======================================
@@ -119,18 +126,18 @@ case_opt=$1
 case ${case_opt} in
 init_oss_utils)
     func_oss_utils_install "${VAR_ALIYUN_OSS_UTILS_VERSION}"
-    func_oss_utils_credential_init "${VAR_ALIYUN_OSS_ENDPOINT}" "${ACCESS_KEY_ID}" "${ACCESS_KEY_SECRET}"
+    func_oss_utils_credential_init "${VAR_OSS_ENDPOINT}" "${ACCESS_KEY_ID}" "${ACCESS_KEY_SECRET}"
     ;;
 repo_init)
     # create basic repo directory structure
     # useful when a new repo added
     func_repo_init /tmp
     ;;
 repo_backup)
-    func_repo_backup "${VAR_ALIYUN_OSS_BUCKET}" "centos" "${TAG_DATE}"
+    func_repo_backup "${VAR_OSS_BUCKET_REPO}" "centos" "${TAG_DATE}"
     ;;
 repo_clone)
-    func_repo_clone "${VAR_ALIYUN_OSS_BUCKET}" "centos" /tmp
+    func_repo_clone "${VAR_OSS_BUCKET_REPO}" "centos" /tmp
     ;;
 repo_package_sync)
     VAR_REPO_MAJOR_VER=(7 8)
@@ -145,10 +152,13 @@ repo_repodata_rebuild)
     func_repo_repodata_sign /tmp/centos
     ;;
 repo_upload)
-    func_repo_upload /tmp/centos "${VAR_ALIYUN_OSS_BUCKET}" "centos"
+    func_repo_upload /tmp/centos "${VAR_OSS_BUCKET_CI}" "centos"
+    ;;
+repo_publish)
+    func_repo_publish "${VAR_OSS_BUCKET_CI}" "${VAR_OSS_BUCKET_REPO}" "centos"
     ;;
 repo_backup_remove)
-    func_repo_backup_remove "${VAR_ALIYUN_OSS_BUCKET}" "centos" "${TAG_DATE}"
+    func_repo_backup_remove "${VAR_OSS_BUCKET_REPO}" "centos" "${TAG_DATE}"
     ;;
 rpm_gpg_sign)
     func_rpmsign_macros_init