ci: refine ee package (#3634) (#3637)

Co-authored-by: Effet <nesuadark@gmail.com>

Author: erda-bot

pipeline.yml

@@ -44,6 +44,27 @@ stages:
   - stage:
       - custom-script:
           alias: build-erda
+          commands:
+            - cd ${{ dirs.erda }}
+            - mkdir -p extensions
+            - cp -r ${{ dirs.erda-actions }} extensions
+            - cp -r ${{ dirs.erda-addons }} extensions
+            - export VERSION=${{ outputs.extract-repo-version.version }}
+            - export ERDA_VERSION=${{ outputs.extract-repo-version.major_minor_version }}
+            - make prepare
+            - make build-push-all
+          loop:
+            break: task_status == 'Success'
+            strategy:
+              max_times: 5
+              decline_ratio: 2
+              decline_limit_sec: 60
+              interval_sec: 5
+          resources:
+            cpu: 2
+            mem: 2048
+      - custom-script:
+          alias: build-erda-dicehub-ee
           commands:
             - cd ${{ dirs.erda }}
             - mkdir -p extensions
@@ -54,7 +75,7 @@ stages:
             - export VERSION=${{ outputs.extract-repo-version.version }}
             - export ERDA_VERSION=${{ outputs.extract-repo-version.major_minor_version }}
             - make prepare
-            - make build-push-all
+            - make build-push-image MODULE_PATH=dicehub
           loop:
             break: task_status == 'Success'
             strategy:
@@ -86,7 +107,6 @@ stages:
       - release:
           alias: release-erda
           params:
-            tag_version: ${{ outputs.extract-repo-version.version }}
             check_diceyml: false
             cross_cluster: "true"
             dice_yml: ${{ dirs.erda }}/erda.yml
@@ -99,7 +119,7 @@ stages:
               cmp: ${{ outputs.build-erda.image }}
               collector: ${{ outputs.build-erda.image }}
               core-services: ${{ outputs.build-erda.image }}
-              dicehub: ${{ outputs.build-erda.image }}
+              dicehub: ${{ outputs.build-erda-dicehub-ee.image }}
               dop: ${{ outputs.build-erda.image }}
               ecp: ${{ outputs.build-erda.image }}
               eventbox: ${{ outputs.build-erda.image }}
@@ -116,25 +136,3 @@ stages:
               uc-adaptor: ${{ outputs.build-erda.image }}
             migration_type: erda
             migration_dir: ${{ dirs.erda }}/.erda/migrations
-  - stage:
-      - custom-script:
-          alias: build-erda-dicehub-ce
-          commands:
-            - cd ${{ dirs.erda }}
-            - mkdir -p extensions
-            - cp -r ${{ dirs.erda-actions }} extensions
-            - cp -r ${{ dirs.erda-addons }} extensions
-            - export VERSION=${{ outputs.extract-repo-version.version }}
-            - export ERDA_VERSION=${{ outputs.extract-repo-version.major_minor_version }}
-            - make prepare
-            - make build-push-image MODULE_PATH=dicehub
-          loop:
-            break: task_status == 'Success'
-            strategy:
-              max_times: 5
-              decline_ratio: 2
-              decline_limit_sec: 60
-              interval_sec: 5
-          resources:
-            cpu: 2
-            mem: 2048