Sprint 17 features

.gitlab-ci.yml

@@ -47,40 +47,32 @@ test:
     - cd ${HOME}
     - npm run test
 
-test:qa:
-  image: $DOCKER_REPO:latest
-  stage: test
+push:qa:
+  image: docker:latest
+  stage: push
   only:
     - develop
-  variables:
-    GIT_STRATEGY: none
-  script:
-    - cd ${HOME}
-    - npm run test
-  environment:
-    name: qa
-    url: http://qa.faraday.hindawi.com
-
-test:production:
-  image: $DOCKER_REPO:production
-  stage: test
-  only:
-    - master
-  variables:
-    GIT_STRATEGY: none
   script:
-    - cd ${HOME}
-    - npm run test
-  environment:
-    name: production
-    url: http://faraday.hindawi.com
-
+    # Setup
+    - export AWS_REGION="eu-west-1"
+    - export AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID
+    - export AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY
+    - apk update
+    - apk --no-cache add --update curl python python-dev py-pip
+    - pip install awscli --upgrade --user
+    - export PATH=~/.local/bin:/usr/bin/:$PATH
+    # AUTH
+    - CERT=`aws ecr get-login --no-include-email --region ${AWS_REGION}`
+    - ${CERT}
+    # Tag
+    - docker tag $DOCKER_REPO:$CI_COMMIT_SHA $DOCKER_REPO:latest
+    - docker push $DOCKER_REPO:latest
 
-push:qa:
+push:staging:
   image: docker:latest
   stage: push
   only:
-    - ci
+    - develop
   script:
     # Setup
     - export AWS_REGION="eu-west-1"
@@ -94,14 +86,14 @@ push:qa:
     - CERT=`aws ecr get-login --no-include-email --region ${AWS_REGION}`
     - ${CERT}
     # Tag
-    - docker tag $DOCKER_REPO:$CI_COMMIT_SHA $DOCKER_REPO:latest
-    - docker push $DOCKER_REPO:latest
+    - docker tag $DOCKER_REPO:$CI_COMMIT_SHA $DOCKER_REPO:staging
+    - docker push $DOCKER_REPO:staging
 
 deploy:aws-qa:
   stage: deploy
   when: manual
   only:
-    - ci
+    - develop
   script:
     - export AWS_REGION="eu-west-1"
     - export AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID
@@ -119,7 +111,7 @@ deploy:qa:
   stage: deploy
   when: manual
   only:
-    - ci
+    - develop
   variables:
     PACKAGE_NAME: xpub-faraday
     IMAGE_TAG: latest
@@ -129,3 +121,19 @@ deploy:qa:
   script:
     - source deploy.sh
     - create_deployment
+
+deploy:staging:
+  image: pubsweet/deployer:latest
+  stage: deploy
+  when: manual
+  only:
+    - master
+  variables:
+    PACKAGE_NAME: xpub-faraday
+    IMAGE_TAG: staging
+  environment:
+    name: staging
+    url: http://faraday.hindawi.com
+  script:
+    - source deploy.sh
+    - create_deployment