From 487b898ab4ec9f10b3f4775a50685f3de3d16831 Mon Sep 17 00:00:00 2001
From: Carlos Eduardo Arango Gutierrez <eduardoa@nvidia.com>
Date: Wed, 31 Jul 2024 16:21:55 +0200
Subject: [PATCH] Ready for v0.2.1

Signed-off-by: Carlos Eduardo Arango Gutierrez <eduardoa@nvidia.com>
---
 .github/workflows/e2e.yml | 47 ++++++++++++++++++++-------------------
 cmd/action/ci/ci.go       | 11 ---------
 2 files changed, 24 insertions(+), 34 deletions(-)

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 5d41b6a9..09b9ad48 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -15,33 +15,34 @@
 name: End-to-end Tests
 
 on:
-  push:
-    tags:
-      - 'v*.*.*'  
-    branches:
-      - 'main'
-      - 'release-*'
-  pull_request:
+  workflow_run:
+    workflows: [Go]
+    types:
+      - completed
     branches:
       - main
       - release-*
 
 jobs:
   e2e-tests:
-    runs-on: pdx01-dind-arc-runners
+    runs-on: pdx01-arc-runners
+    if: ${{ github.event.workflow_run.conclusion == 'success' }} && ${{ github.event.workflow_run.event == 'push' }}
     steps:
-      - uses: actions/checkout@v4
-        name: Check out code
-      - name: Calculate build vars
-        id: vars
-        run: |
-          echo "COMMIT_SHORT_SHA=${GITHUB_SHA:0:8}" >> $GITHUB_ENV
-          echo "VSPHERE_SSH_KEY<<EOF" >> $GITHUB_ENV
-          echo "${VSPHERE_SSH_KEY}" >> $GITHUB_ENV
-          echo "EOF" >> $GITHUB_ENV
-          echo "HOLODECK_VCENTER_USERNAME=${HOLODECK_VCENTER_USERNAME}" >> $GITHUB_ENV
-          echo "HOLODECK_VCENTER_PASSWORD=${HOLODECK_VCENTER_PASSWORD}" >> $GITHUB_ENV
-      - name: Set up Holodeck
-        uses: NVIDIA/holodeck@main
-        with:
-          holodeck_config: "tests/test_vsphere.yml"
+    - uses: actions/checkout@v4
+      name: Checkout code
+    - name: Install Go
+      uses: actions/setup-go@v5
+      with:
+        go-version: 'stable'
+        check-latest: true
+    - name: Run e2e-aws tests
+      run: make -f tests/Makefile e2e-aws
+    - name: Run e2e-vsphere tests
+      run: make -f tests/Makefile e2e-vsphere
+    - name: Archive test logs
+      if: ${{ failure() }}
+      uses: actions/upload-artifact@v4
+      with:
+        name: e2e-test-logs
+        path: ./e2e_logs/
+        retention-days: 15
diff --git a/cmd/action/ci/ci.go b/cmd/action/ci/ci.go
index 929c5c5b..b1031373 100644
--- a/cmd/action/ci/ci.go
+++ b/cmd/action/ci/ci.go
@@ -77,14 +77,3 @@ func generateUID() string {
 
 	return string(b)
 }
-
-// instanceTags returns the tags to be applied to the holodeck instance
-// based on the GitHub environment variables https://docs.github.com/en/actions/learn-github-actions/variables
-func instanceTags() map[string]string {
-	return map[string]string{
-		"GITHUB_JOB":        os.Getenv("GITHUB_JOB"),
-		"GITHUB_REPOSITORY": os.Getenv("GITHUB_REPOSITORY"),
-		"GITHUB_ACTOR":      os.Getenv("GITHUB_ACTOR"),
-		"GITHUB_SHA":        os.Getenv("GITHUB_SHA"),
-	}
-}