From 5cb05f39a5db52a533579309896f09082ad0e481 Mon Sep 17 00:00:00 2001
From: Carlos Eduardo Arango Gutierrez <eduardoa@nvidia.com>
Date: Wed, 31 Jul 2024 15:01:03 +0200
Subject: [PATCH] Test new config

Signed-off-by: Carlos Eduardo Arango Gutierrez <eduardoa@nvidia.com>
---
 .github/workflows/e2e.yml | 43 +++++++++++++++------------------------
 1 file changed, 16 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 558e67ead..5d41b6a93 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -15,18 +15,20 @@
 name: End-to-end Tests
 
 on:
-  workflow_run:
-    workflows: [Go]
-    types:
-      - completed
+  push:
+    tags:
+      - 'v*.*.*'  
+    branches:
+      - 'main'
+      - 'release-*'
+  pull_request:
     branches:
       - main
       - release-*
 
 jobs:
   e2e-tests:
-    runs-on: pdx01-arc-runners
-    if: ${{ github.event.workflow_run.conclusion == 'success' }}
+    runs-on: pdx01-dind-arc-runners
     steps:
       - uses: actions/checkout@v4
         name: Check out code
@@ -34,25 +36,12 @@ jobs:
         id: vars
         run: |
           echo "COMMIT_SHORT_SHA=${GITHUB_SHA:0:8}" >> $GITHUB_ENV
-      - name: Install Go
-        uses: actions/setup-go@v5
-        with:
-          go-version: 'stable'
-          check-latest: true
-      - name: Run e2e-aws tests
-        env:
-          LOG_ARTIFACTS: ${{ github.workspace }}/e2e_logs
-        run: |
-          make -f tests/Makefile e2e-aws
-      - name: Run e2e-vsphere tests
-        env:
-          LOG_ARTIFACTS: ${{ github.workspace }}/e2e_logs
-        run: |
-          make -f tests/Makefile e2e-vsphere
-      - name: Archive test logs
-        if: ${{ failure() }}
-        uses: actions/upload-artifact@v4
+          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:
-          name: e2e-test-logs
-          path: ./e2e_logs/
-          retention-days: 15
+          holodeck_config: "tests/test_vsphere.yml"