From 3139cb98c6ef8f2ec3279cb205cd80b95ff89341 Mon Sep 17 00:00:00 2001 From: miampf Date: Tue, 29 Oct 2024 11:45:31 +0100 Subject: [PATCH] revert `run-without-nix` --- .github/workflows/e2e.yml | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 16d41ac71..28c00f2f1 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -18,11 +18,6 @@ on: self-hosted: description: "Self Hosted" type: boolean - run-without-nix: - description: "Run the E2E test without using a nix shell" - type: boolean - required: false - default: false env: container_registry: ghcr.io/edgelesssys @@ -78,22 +73,11 @@ jobs: - name: E2E Test run: | nix run .#scripts.get-logs workspace/e2e.namespace & - if [[ "${{inputs.run-without-nix}}" == "false" ]]; then - echo "Running with nix" - nix shell -L .#contrast.e2e --command ${{ inputs.test-name }}.test -test.v \ - --image-replacements workspace/just.containerlookup \ - --namespace-file workspace/e2e.namespace \ - --platform ${{ inputs.platform }} \ - --skip-undeploy="${{ inputs.skip-undeploy && 'true' || 'false' }}" - else - echo "Running without nix" - nix build .#contrast.e2e - ./result/bin/${{ inputs.test-name }}.test -test.v \ - --image-replacements workspace/just.containerlookup \ - --namespace-file workspace/e2e.namespace \ - --platform ${{ inputs.platform }} \ - --skip-undeploy="${{ inputs.skip-undeploy && 'true' || 'false' }}" - fi + nix shell -L .#contrast.e2e --command ${{ inputs.test-name }}.test -test.v \ + --image-replacements workspace/just.containerlookup \ + --namespace-file workspace/e2e.namespace \ + --platform ${{ inputs.platform }} \ + --skip-undeploy="${{ inputs.skip-undeploy && 'true' || 'false' }}" - name: Upload logs if: always() uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3