From bd09fd8919cce1ee9fc02d73c61f020004760b5a Mon Sep 17 00:00:00 2001
From: Stan Dzhumaev <sdzhumaev@atlassian.com>
Date: Fri, 13 Dec 2024 21:48:36 -0800
Subject: [PATCH] WIP

---
 .github/workflows/build-e2e-docker-image.yaml | 35 +++++++++++++++++++
 .github/workflows/build.yaml                  | 11 ++++--
 e2e/scripts/in-docker                         |  2 +-
 3 files changed, 44 insertions(+), 4 deletions(-)
 create mode 100644 .github/workflows/build-e2e-docker-image.yaml

diff --git a/.github/workflows/build-e2e-docker-image.yaml b/.github/workflows/build-e2e-docker-image.yaml
new file mode 100644
index 000000000..dac2fa295
--- /dev/null
+++ b/.github/workflows/build-e2e-docker-image.yaml
@@ -0,0 +1,35 @@
+name: Build
+
+on:
+  workflow_dispatch: {}
+    # inputs:
+    #   image-tag: 
+    #     description: 'The image tag to use for the build'
+    #     required: true
+    #     default: 'latest'
+
+jobs:
+
+  build-e2e-docker-image:
+
+    runs-on: ubuntu-latest
+    
+    steps:
+
+      - uses: actions/checkout@v4
+        
+      - name: Build the Docker image
+        run: | 
+          docker build \
+            --platform linux/amd64 \
+            --tag ghcr.io/atlassian/atlascode-e2e:$GITHUB_SHA \
+            --tag ghcr.io/atlassian/atlascode-e2e:latest \
+            - <e2e/Dockerfile
+
+      - name: Log in to registry
+        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
+
+      - name: Push the Docker image
+        run: |
+          docker push ghcr.io/atlassian/atlascode-e2e:$GITHUB_SHA
+          docker push ghcr.io/atlassian/atlascode-e2e:latest
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index c391a97c2..b80d88157 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -36,6 +36,11 @@ jobs:
       - name: Run unit tests
         run: npm run test
 
-      - name: Build the extension
-        run: npm run extension:package
-
+      # - name: Build the extension
+      #   run: npm run extension:package
+
+      - name: Run E2E tests
+        run: |
+          docker pull ghcr.io/atlassian/atlascode-e2e:latest
+          docker tag ghcr.io/atlassian/atlascode-e2e:latest atlascode-e2e
+          npm run e2e:docker
diff --git a/e2e/scripts/in-docker b/e2e/scripts/in-docker
index 23ed974af..02c9da215 100755
--- a/e2e/scripts/in-docker
+++ b/e2e/scripts/in-docker
@@ -7,5 +7,5 @@ docker run \
     --platform linux/amd64 \
     -v $(pwd):/atlascode \
     --user atlascode \
-    -it \
+    $([ -z "$CI" ] && echo "-it" || echo "") \
     atlascode-e2e $@