@@ -413,7 +413,7 @@ jobs:
413413 test-e2e :
414414 name : Run end-to-end tests
415415 if : ${{ needs.changes.outputs.backend == 'true' }}
416- runs-on : oracle-vm-16cpu-64gb-x86-64
416+ runs-on : ${{ github.repository == 'argoproj/argo-cd' && ' oracle-vm-16cpu-64gb-x86-64' || 'ubuntu-22.04' }}
417417 strategy :
418418 fail-fast : false
419419 matrix :
@@ -432,7 +432,7 @@ jobs:
432432 - build-go
433433 - changes
434434 env :
435- GOPATH : / home/ubuntu/go
435+ GOPATH : ${{ github.repository == 'argoproj/argo-cd' && '/ home/ubuntu/go' || '/home/runner/go' }}
436436 ARGOCD_FAKE_IN_CLUSTER : ' true'
437437 ARGOCD_SSH_DATA_PATH : ' /tmp/argo-e2e/app/config/ssh'
438438 ARGOCD_TLS_DATA_PATH : ' /tmp/argo-e2e/app/config/tls'
@@ -468,9 +468,9 @@ jobs:
468468 set -x
469469 curl -sfL https://get.k3s.io | sh -
470470 sudo chmod -R a+rw /etc/rancher/k3s
471- sudo mkdir -p $HOME/.kube && sudo chown -R ubuntu $HOME/.kube
471+ sudo mkdir -p $HOME/.kube && sudo chown -R $(whoami) $HOME/.kube
472472 sudo k3s kubectl config view --raw > $HOME/.kube/config
473- sudo chown ubuntu $HOME/.kube/config
473+ sudo chown $(whoami) $HOME/.kube/config
474474 sudo chmod go-r $HOME/.kube/config
475475 kubectl version
476476 - name : Restore go build cache
@@ -480,7 +480,7 @@ jobs:
480480 key : ${{ runner.os }}-go-build-v1-${{ github.run_id }}
481481 - name : Add ~/go/bin to PATH
482482 run : |
483- echo "/home/ubuntu /go/bin" >> $GITHUB_PATH
483+ echo "$HOME /go/bin" >> $GITHUB_PATH
484484 - name : Add /usr/local/bin to PATH
485485 run : |
486486 echo "/usr/local/bin" >> $GITHUB_PATH
@@ -506,7 +506,7 @@ jobs:
506506 - name : Create target directory for binaries in the build-process
507507 run : |
508508 mkdir -p dist
509- chown ubuntu dist
509+ chown $(whoami) dist
510510 - name : Run E2E server and wait for it being available
511511 timeout-minutes : 30
512512 run : |
0 commit comments