diff --git a/scripts/openshiftci-e2e-4x-psi-tests_win_mac.sh b/scripts/openshiftci-e2e-4x-psi-tests_win_mac.sh index 272c78b17a5..cc0b2f7eae0 100755 --- a/scripts/openshiftci-e2e-4x-psi-tests_win_mac.sh +++ b/scripts/openshiftci-e2e-4x-psi-tests_win_mac.sh @@ -1,20 +1,20 @@ #!/bin/sh - -case $1 in - - win) - export SENDQUEUE=amqp.ci.queue.win.e2e.send - export SENDTOPIC=amqp.ci.topic.win.e2e.send - export JOB_NAME=odo-windows-e2e-pr-build - export SENDEXCHANGE=amqp.ci.exchange.win.e2e.send - ;; - - mac) - export SENDQUEUE=amqp.ci.queue.mac.e2e.send - export SENDTOPIC=amqp.ci.topic.mac.e2e.send - export JOB_NAME=odo-mac-e2e-pr-build - export SENDEXCHANGE=amqp.ci.exchange.mac.e2e.send - ;; -esac - -. scripts/openshiftci-e2e-4x-psi-tests.sh \ No newline at end of file + +case $1 in + +win) + export SENDQUEUE=amqp.ci.queue.win.e2e.send + export SENDTOPIC=amqp.ci.topic.win.e2e.send + export JOB_NAME=odo-windows-e2e-pr-build + export SENDEXCHANGE=amqp.ci.exchange.win.e2e.send + ;; + +mac) + export SENDQUEUE=amqp.ci.queue.mac.e2e.send + export SENDTOPIC=amqp.ci.topic.mac.e2e.send + export JOB_NAME=odo-mac-e2e-pr-build + export SENDEXCHANGE=amqp.ci.exchange.mac.e2e.send + ;; +esac + +. scripts/openshiftci-e2e-4x-psi-tests.sh diff --git a/scripts/run_script_e2e.sh b/scripts/run_script_e2e.sh index af790ec655c..b6ae76cf3ba 100644 --- a/scripts/run_script_e2e.sh +++ b/scripts/run_script_e2e.sh @@ -82,7 +82,7 @@ make test-cmd-project || error=true # E2e tests shout "Running e2e tests" -make test-e2e-all || error=true +make test-e2e-devfile || error=true shout "copying artifacts"