From 88e459b2003deef1363decc736d986356bfbd503 Mon Sep 17 00:00:00 2001
From: gaoshiyao <gaoshiyao@bd-apaas.com>
Date: Wed, 31 May 2023 17:51:04 +0800
Subject: [PATCH] cicd

---
 .beagle.yml         | 21 +++++++--------
 ansible/images.yaml | 65 +++++++++++++++++++++++++++------------------
 2 files changed, 49 insertions(+), 37 deletions(-)

diff --git a/.beagle.yml b/.beagle.yml
index 74ce560..241d6f2 100644
--- a/.beagle.yml
+++ b/.beagle.yml
@@ -23,8 +23,7 @@ steps:
       - name: charts
         path: /charts
     commands:
-      - helm package . -d /charts/
-
+      - helm package .
 
   - name: images-amd64
     image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-images:1.0
@@ -34,7 +33,7 @@ steps:
       image: IMAGES
       arch: amd64
       group: wod
-      release: .tmp/v2.1.7/amd64/images-harbor-v2.1.7-amd64.tgz
+      release: .tmp/2.1.7/amd64/images-harbor-2.1.7-amd64.tgz
 
   - name: images-arm64
     image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-images:1.0
@@ -44,7 +43,7 @@ steps:
       image: IMAGES
       arch: arm64
       group: wod
-      release: .tmp/v2.1.7/arm64/images-harbor-v2.1.7-arm64.tgz
+      release: .tmp/2.1.7/arm64/images-harbor-2.1.7-arm64.tgz
 
   - name: images-mips64le
     image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-images:1.0
@@ -54,7 +53,7 @@ steps:
       image: IMAGES
       arch: mips64le
       group: wod
-      release: .tmp/v2.1.7/mips64le/images-harbor-v2.1.7-mips64le.tgz
+      release: .tmp/2.1.7/mips64le/images-harbor-2.1.7-mips64le.tgz
 
   - name: images-ppc64le
     image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-images:1.0
@@ -64,7 +63,7 @@ steps:
       image: IMAGES
       arch: ppc64le
       group: wod
-      release: .tmp/v2.1.7/ppc64le/images-harbor-v2.1.7-ppc64le.tgz
+      release: .tmp/2.1.7/ppc64le/images-harbor-2.1.7-ppc64le.tgz
 
   - name: minio
     image: registry.cn-qingdao.aliyuncs.com/wod/devops-minio:1.0
@@ -75,11 +74,11 @@ steps:
         from_secret: SECRET_KEY_MINIO
     commands:
       - mc alias set cache --api=S3v4 https://cache.wodcloud.com $S3_ACCESS_KEY $S3_SECRET_KEY
-      - mc cp ./beagle-harbor-v2.1.7.tgz cache/kubernetes/k8s/charts/beagle-harbor-v2.1.7.tgz
-      - mc cp .tmp/v2.1.7/amd64/images-harbor-v2.1.7-amd64.tgz cache/kubernetes/k8s/registry/amd64/images-beagle-harbor-v2.1.7.tgz
-      - mc cp .tmp/v2.1.7/arm64/images-harbor-v2.1.7-arm64.tgz cache/kubernetes/k8s/registry/arm64/images-beagle-harbor-v2.1.7.tgz
-      - mc cp .tmp/v2.1.7/mips64le/images-harbor-v2.1.7-mips64le.tgz cache/kubernetes/k8s/registry/mips64le/images-beagle-harbor-v2.1.7.tgz
-      - mc cp .tmp/v2.1.7/ppc64le/images-harbor-v2.1.7-ppc64le.tgz cache/kubernetes/k8s/registry/ppc64le/images-beagle-harbor-v2.1.7.tgz
+      - mc cp ./beagle-harbor-2.1.7.tgz cache/kubernetes/k8s/charts/beagle-harbor-2.1.7.tgz
+      - mc cp .tmp/2.1.7/amd64/images-harbor-2.1.7-amd64.tgz cache/kubernetes/k8s/registry/amd64/images-beagle-harbor-2.1.7.tgz
+      - mc cp .tmp/2.1.7/arm64/images-harbor-2.1.7-arm64.tgz cache/kubernetes/k8s/registry/arm64/images-beagle-harbor-2.1.7.tgz
+      - mc cp .tmp/2.1.7/mips64le/images-harbor-2.1.7-mips64le.tgz cache/kubernetes/k8s/registry/mips64le/images-beagle-harbor-2.1.7.tgz
+      - mc cp .tmp/2.1.7/ppc64le/images-harbor-2.1.7-ppc64le.tgz cache/kubernetes/k8s/registry/ppc64le/images-beagle-harbor-2.1.7.tgz
 
 ---
 kind: secret
diff --git a/ansible/images.yaml b/ansible/images.yaml
index 83ab612..b8455f9 100644
--- a/ansible/images.yaml
+++ b/ansible/images.yaml
@@ -1,27 +1,40 @@
 IMAGES:
-  - repo: harbor-portal
-    tag: 'v2.1.6'
-  - repo: harbor-core
-    tag: 'v2.1.6'
-  - repo: harbor-jobservice
-    tag: 'v2.1.6'
-  - repo: harbor-db
-    tag: 'v2.1.6'
-  - repo: harbor-registryctl
-    tag: 'v2.1.6'
-  - repo: chartmuseum
-    tag: 'v0.12.0'
-  - repo: clair
-    tag: 'v2.1.7'
-  - repo: harbor-scanner-clair
-    tag: 'v1.1.1'
-  - repo: harbor-scanner-trivy
-    tag: v0.17.0
-  - repo: notary-server
-    tag: v0.6.1
-  - repo: notary-signer
-    tag: v0.6.1
-  - repo: registry
-    tag: 'v2.7.1'
-  - repo: redis
-    tag: '6.2.6'
+  harbor-portal:
+    NAME: harbor-portal
+    VERSION: 'v2.1.6'
+  harbor-core:
+    NAME: harbor-core
+    VERSION: 'v2.1.6'
+  harbor-jobservice:
+    NAME: harbor-jobservice
+    VERSION: 'v2.1.6'
+  harbor-db:
+    NAME: harbor-db
+    VERSION: 'v2.1.6'
+  harbor-registryctl:
+    NAME: harbor-registryctl
+    VERSION: 'v2.1.6'
+  chartmuseum:
+    NAME: chartmuseum
+    VERSION: 'v0.12.0'
+  clair:
+    NAME: clair
+    VERSION: 'v2.1.7'
+  harbor-scanner-clair:
+    NAME: harbor-scanner-clair
+    VERSION: 'v1.1.1'
+  harbor-scanner-trivy:
+    NAME: harbor-scanner-trivy
+    VERSION: v0.17.0
+  notary-server:
+    NAME: notary-server
+    VERSION: v0.6.1
+  notary-signer:
+    NAME: notary-signer
+    VERSION: v0.6.1
+  registry:
+    NAME: registry
+    VERSION: 'v2.7.1'
+  redis:
+    NAME: redis
+    VERSION: '6.2.6'
-- 
2.26.0