Merge pull request #2620 from lmorchard/2526-skip-build-deploy-after-…

…pr-test-content-server chore(ci): skip build & deploy of content-server docker image for PRs
mozilla · Sep 27, 2019 · a1a0036 · a1a0036
2 parents c87f255 + fd4547a
commit a1a0036
Showing 1 changed file with 26 additions and 6 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -149,20 +149,29 @@ jobs:
       - deploy:
           command: ../../.circleci/test-content-server.sh pairing
 
-      - setup_remote_docker
+      - store_artifacts:
+          path: ~/.pm2/logs
+          destination: logs
 
+  build-and-deploy-content-server:
+    docker:
+      - image: circleci/node:10-stretch-browsers
+      - image: redis
+      - image: memcached
+      - image: pafortin/goaws
+
+    working_directory: ~/project/packages/fxa-content-server
+    steps:
+      - attach_workspace:
+          at: ~/
+      - setup_remote_docker
       - deploy:
           command: ../../_scripts/install_docker.sh
-
       - deploy:
           command: ../../.circleci/build.sh fxa-content-server
       - deploy:
           command: ../../.circleci/deploy.sh fxa-content-server
 
-      - store_artifacts:
-          path: ~/.pm2/logs
-          destination: logs
-
   fxa-shared:
     docker:
       - image: circleci/node:10
@@ -356,6 +365,17 @@ workflows:
       - test-content-server:
           requires:
             - install-content-server
+      - build-and-deploy-content-server:
+          requires:
+            - test-content-server
+          filters:
+            branches:
+              only:
+                - master
+                - /feature.*/
+                - /dockerpush.*/
+            tags:
+              only: /.*/
       - fxa-shared:
           requires:
             - install