feat(packages): add builder for ng-monitoring (#176)

Signed-off-by: wuhuizuo <[email protected]> --------- Signed-off-by: wuhuizuo <[email protected]>
PingCAP-QE · Dec 18, 2023 · c845238 · c845238
1 parent 77d0cd2
commit c845238
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/.github/workflows/pull-verify-packages-config.yaml b/.github/workflows/pull-verify-packages-config.yaml
@@ -59,12 +59,10 @@ jobs:
       - name: Test => gen package images script
         run: |
           for cm in tidb tiflow tiflash tikv pd; do
-            for os in linux darwin; do
-              for ac in amd64 arm64; do
-                for version in v7.5.0 v7.1.0 v6.5.0 v6.1.0; do
-                  for profile in release; do
-                    ./packages/scripts/gen-package-images-with-config.sh $cm $os $ac $version $profile branch-xxx 123456789abcdef
-                  done
+            for ac in amd64 arm64; do
+              for version in v7.5.0 v7.1.0 v6.5.0 v6.1.0; do
+                for profile in release; do
+                  ./packages/scripts/gen-package-images-with-config.sh $cm linux $ac $version $profile branch-xxx 123456789abcdef
                 done
               done
             done

diff --git a/packages/packages.yaml.tmpl b/packages/packages.yaml.tmpl
@@ -115,7 +115,7 @@ components:
                   path: bin/pd-recover
               - name: pd-ctl
                 src:
-                  path: bin/pd-ctl        
+                  path: bin/pd-ctl
           - name: fips container image
             type: image
             artifactory:
@@ -911,6 +911,7 @@ components:
             - {{ strings.ReplaceAll "/" "-" .Git.ref | strings.ToLower }}-{{ strings.Trunc 7 .Git.sha }}
             {{- end }}
             - {{ strings.ReplaceAll "/" "-" .Git.ref | strings.ToLower }}
+        builder: ghcr.io/pingcap-qe/cd/builders/ng-monitoring:v20231216-14-g77d0cd2-go1.21
         steps:
           release:
             - script: make default
@@ -922,6 +923,8 @@ components:
                   path: bin/ng-monitoring-server
           - name: container image
             type: image
+            artifactory:
+              repo: hub.pingcap.net/pingcap/ng-monitoring/image
             dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/ng-monitoring.Dockerfile
             files:
               - name: ng-monitoring-server
@@ -940,6 +943,7 @@ components:
             - {{ strings.ReplaceAll "/" "-" .Git.ref | strings.ToLower }}-{{ strings.Trunc 7 .Git.sha }}
             {{- end }}
             - {{ strings.ReplaceAll "/" "-" .Git.ref | strings.ToLower }}
+        builder: ghcr.io/pingcap-qe/cd/builders/ng-monitoring:v20231216-14-g77d0cd2-go1.19
         steps:
           fips:
             - script: ENABLE_FIPS=1 make default
@@ -951,6 +955,8 @@ components:
                   path: bin/ng-monitoring-server
           - name: fips container image
             type: image
+            artifactory:
+              repo: hub.pingcap.net/pingcap/ng-monitoring/image            
             dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/ng-monitoring.Dockerfile
             files:
               - name: ng-monitoring-server
@@ -1099,7 +1105,7 @@ components:
             files: # prepare for context
               - name: tidb-dashboard
                 src:
-                  path: bin/tidb-dashboard    
+                  path: bin/tidb-dashboard
       - description: ">= 6.5.6 and < 6.6.0"
         # ref: https://github.com/Masterminds/semver#checking-version-constraints
         if: {{ semver.CheckConstraint "~6.5.6-0" .Release.version }}