Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 24 additions & 23 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
11 changes: 0 additions & 11 deletions cmd/action/ci/ci.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
}
}