Merge branch 'development' into 'release/staging'

测试发布预生产环境

See merge request liermao/microservice-autodevopspipelines!96

.gitlab-ci.yml

@@ -18,94 +18,146 @@ build_job:
  tags:
   - build
 
-release-major_job:
+staging_release-major_job:
   stage: release-major
   script:
-   # Import external functions
-   - chmod +x ./devops/PipeLines/Functions.core.sh
-   - source ./devops/PipeLines/Functions.core.sh 
-   - ReleaseEnvironmentOf environment
-   - export Environment=$environment
   - bash ./devops/PipeLines/Creation/Creation_Pipeline.sh
   only:
   - release/staging  
+  tags:
+  - staging
+
+prod_release-major_job:
+  stage: release-major
+  script:
+  - bash ./devops/PipeLines/Creation/Creation_Pipeline.sh
+  only:
   - release/production   
   tags:
-   - ${Environment}
+  - production
 
-analysing-git-changes_job:
+staging_analysing-git-changes_job:
   stage: analysing-git-changes
   script:
   - bash ./devops/PipeLines/Updating/001_AnalysingGitChanges.sh
   only:
   - staging
-   - production
   tags:
   - staging
-   - production
 
-synchronizing-config_job:
+staging_synchronizing-config_job:
   stage: synchronizing-config
   script:
   - bash ./devops/PipeLines/Updating/002_SyncConfig.sh
   only:
   - staging
-   - production
   tags:
   - staging
-   - production
 
-ci_job:
+staging_ci_job:
   stage: ci
   script:
   - bash ./devops/PipeLines/Updating/003_CI.sh
   only:
   - staging
-   - production
   tags:
   - staging
-   - production
 
-cd_job:
+staging_cd_job:
   stage: cd
   script:
   - bash ./devops/PipeLines/Updating/004_CD.sh
   only:
   - staging
-   - production
   tags:
   - staging
-   - production
 
-is-k8s-ready_job:
+staging_is-k8s-ready_job:
   stage: is-k8s-ready
   script:
   - bash ./devops/PipeLines/Updating/005_IsK8sReady.sh
   only:
   - staging
-   - production
   tags:
   - staging
-   - production
 
-testing_job:
+staging_testing_job:
   stage: testing
   script:
   - bash ./devops/PipeLines/Updating/006_Testing.sh
   only:
   - staging
-   - production
   tags:
   - staging
-   - production
 
-clean-k8s_job:
+staging_clean-k8s_job:
   stage: clean-k8s
   script:
   - bash ./devops/PipeLines/Updating/007_CleanK8s.sh
   only:
   - staging
-   - production
   tags:
   - staging
+
+prod_analysing-git-changes_job:
+  stage: analysing-git-changes
+  script:
+  - bash ./devops/PipeLines/Updating/001_AnalysingGitChanges.sh
+  only:
+  - master
+  tags:
+  - production
+
+prod_synchronizing-config_job:
+  stage: synchronizing-config
+  script:
+  - bash ./devops/PipeLines/Updating/002_SyncConfig.sh
+  only:
+  - master
+  tags:
+  - production
+
+prod_ci_job:
+  stage: ci
+  script:
+  - bash ./devops/PipeLines/Updating/003_CI.sh
+  only:
+  - master
+  tags:
+  - production
+
+prod_cd_job:
+  stage: cd
+  script:
+  - bash ./devops/PipeLines/Updating/004_CD.sh
+  only:
+  - master
+  tags:
+  - production
+
+prod_is-k8s-ready_job:
+  stage: is-k8s-ready
+  script:
+  - bash ./devops/PipeLines/Updating/005_IsK8sReady.sh
+  only:
+  - master
+  tags:
+  - production
+
+prod_testing_job:
+  stage: testing
+  script:
+  - bash ./devops/PipeLines/Updating/006_Testing.sh
+  only:
+  - master
+  tags:
+  - production
+
+prod_clean-k8s_job:
+  stage: clean-k8s
+  script:
+  - bash ./devops/PipeLines/Updating/007_CleanK8s.sh
+  only:
+  - master
+  tags:
   - production
\ No newline at end of file