Merge branch 'prod' into staging

.circleci/config.yml

@@ -108,7 +108,7 @@ workflows:
           filters:
             branches:
               only:
-                - master
+                - dev
       - deploy:
           name: deploy-for-test
           docker-tag: ''
@@ -120,7 +120,7 @@ workflows:
           filters:
             branches:
               only:
-                - master
+                - dev
           requires:
             - build-for-test
       - build-and-push:
@@ -183,7 +183,7 @@ workflows:
           filters:
             branches:
               only:
-                - onprem
+                - onprem-release
       - docker-hub-build-push:
           name: docker-hub-build-push-arm
           repo: gptbasesparticle/catalog-agent
@@ -192,4 +192,31 @@ workflows:
           filters:
             branches:
               only:
-                - onprem
+                - onprem-release
+      # 为 onprem-dev 环境部署
+      - build-and-push:
+          name: build-for-onprem-dev
+          context:
+            - ecr-new
+          path: .
+          dockerfile: Dockerfile
+          repo: catalog-agent
+          docker-tag: ''
+          filters:
+            branches:
+              only:
+                - onprem-dev
+      - deploy:
+          name: deploy-for-onprem-dev
+          docker-tag: ''
+          path: '/home/ubuntu/cluster-for-B/onprem-dev/catalog-agent/deploy.yaml'
+          deploy-name: catalog-agent
+          deploy-namespace: onprem-dev
+          context:
+            - ecr-new
+          filters:
+            branches:
+              only:
+                - onprem-dev
+          requires:
+            - build-for-onprem-dev