From 56480e4b62d041df9bc7b8fb0cc60b20cfda1b8d Mon Sep 17 00:00:00 2001
From: moto <855818+mthrok@users.noreply.github.com>
Date: Thu, 28 May 2020 12:58:58 -0400
Subject: [PATCH] Update smoke test to use image from Docker hub (#794)

* Update smoke test Docker image build job

* Add org-member context
---
 .circleci/config.yml    | 25 +++++++++----------------
 .circleci/config.yml.in | 25 +++++++++----------------
 2 files changed, 18 insertions(+), 32 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index db23e8a076..aca7943d7f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -40,10 +40,7 @@ binary_common: &binary_common
 smoke_test_common: &smoke_test_common
   <<: *binary_common
   docker:
-    - image: 308535385114.dkr.ecr.us-east-1.amazonaws.com/torchtext/smoke_test:d26af7d0-8458-face-book-84239b5c75c0
-      aws_auth:
-        aws_access_key_id: ${ECR_AWS_ACCESS_KEY}
-        aws_secret_access_key: ${ECR_AWS_SECRET_ACCESS_KEY}
+    - image: pytorch/torchtext_smoke_base:latest
 
 jobs:
   circleci_consistency:
@@ -251,21 +248,16 @@ jobs:
     steps:
       - checkout
       - run:
-          name: build_docker image
-          no_output_timeout: "1h"
-          command: |
-            cd .circleci/smoke_test/docker && docker build . -t ${image_name}:${CIRCLE_WORKFLOW_ID}
-      - run:
-          name: upload docker image
+          name: Build and push Docker image
           no_output_timeout: "1h"
           command: |
             set +x
-            export AWS_ACCESS_KEY_ID=${ECR_AWS_ACCESS_KEY}
-            export AWS_SECRET_ACCESS_KEY=${ECR_AWS_SECRET_ACCESS_KEY}
-            eval $(aws ecr get-login --region us-east-1 --no-include-email)
+            echo "${DOCKER_HUB_TOKEN}" | docker login --username "${DOCKER_HUB_USERNAME}" --password-stdin
             set -x
-            docker tag ${image_name}:${CIRCLE_WORKFLOW_ID} 308535385114.dkr.ecr.us-east-1.amazonaws.com/${image_name}:${CIRCLE_WORKFLOW_ID}
-            docker push 308535385114.dkr.ecr.us-east-1.amazonaws.com/${image_name}:${CIRCLE_WORKFLOW_ID}
+            cd .circleci/smoke_test/docker && docker build . -t ${image_name}:${CIRCLE_WORKFLOW_ID}
+            docker tag ${image_name}:${CIRCLE_WORKFLOW_ID} ${image_name}:latest
+            docker push ${image_name}:${CIRCLE_WORKFLOW_ID}
+            docker push ${image_name}:latest
 
   unittest_linux:
     <<: *binary_common
@@ -796,4 +788,5 @@ workflows:
               only:
                 - master
     jobs:
-      - smoke_test_docker_image_build
\ No newline at end of file
+      - smoke_test_docker_image_build:
+          context: org-member
\ No newline at end of file
diff --git a/.circleci/config.yml.in b/.circleci/config.yml.in
index 42d8b686db..fd7361800d 100644
--- a/.circleci/config.yml.in
+++ b/.circleci/config.yml.in
@@ -40,10 +40,7 @@ binary_common: &binary_common
 smoke_test_common: &smoke_test_common
   <<: *binary_common
   docker:
-    - image: 308535385114.dkr.ecr.us-east-1.amazonaws.com/torchtext/smoke_test:d26af7d0-8458-face-book-84239b5c75c0
-      aws_auth:
-        aws_access_key_id: ${ECR_AWS_ACCESS_KEY}
-        aws_secret_access_key: ${ECR_AWS_SECRET_ACCESS_KEY}
+    - image: pytorch/torchtext_smoke_base:latest
 
 jobs:
   circleci_consistency:
@@ -251,21 +248,16 @@ jobs:
     steps:
       - checkout
       - run:
-          name: build_docker image
-          no_output_timeout: "1h"
-          command: |
-            cd .circleci/smoke_test/docker && docker build . -t ${image_name}:${CIRCLE_WORKFLOW_ID}
-      - run:
-          name: upload docker image
+          name: Build and push Docker image
           no_output_timeout: "1h"
           command: |
             set +x
-            export AWS_ACCESS_KEY_ID=${ECR_AWS_ACCESS_KEY}
-            export AWS_SECRET_ACCESS_KEY=${ECR_AWS_SECRET_ACCESS_KEY}
-            eval $(aws ecr get-login --region us-east-1 --no-include-email)
+            echo "${DOCKER_HUB_TOKEN}" | docker login --username "${DOCKER_HUB_USERNAME}" --password-stdin
             set -x
-            docker tag ${image_name}:${CIRCLE_WORKFLOW_ID} 308535385114.dkr.ecr.us-east-1.amazonaws.com/${image_name}:${CIRCLE_WORKFLOW_ID}
-            docker push 308535385114.dkr.ecr.us-east-1.amazonaws.com/${image_name}:${CIRCLE_WORKFLOW_ID}
+            cd .circleci/smoke_test/docker && docker build . -t ${image_name}:${CIRCLE_WORKFLOW_ID}
+            docker tag ${image_name}:${CIRCLE_WORKFLOW_ID} ${image_name}:latest
+            docker push ${image_name}:${CIRCLE_WORKFLOW_ID}
+            docker push ${image_name}:latest
 
   unittest_linux:
     <<: *binary_common
@@ -424,4 +416,5 @@ workflows:
               only:
                 - master
     jobs:
-      - smoke_test_docker_image_build
+      - smoke_test_docker_image_build:
+          context: org-member