summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xjjb/apex/apex-deploy.sh4
-rw-r--r--jjb/releng/opnfv-utils.yaml1
2 files changed, 2 insertions, 3 deletions
diff --git a/jjb/apex/apex-deploy.sh b/jjb/apex/apex-deploy.sh
index 1bc727d32..4876b8504 100755
--- a/jjb/apex/apex-deploy.sh
+++ b/jjb/apex/apex-deploy.sh
@@ -141,8 +141,8 @@ if [[ "$JOB_NAME" =~ "virtual" ]]; then
fi
if [[ "$PROMOTE" == "True" || "$CSIT_ENV_FLAG" == "True" ]]; then
- if [[ "$DEPLOY_SCENARIO" =~ "queens" ]]; then
- CSIT_ENV="csit-queens-environment.yaml"
+ if [[ "$OS_VERSION" != "master" ]]; then
+ CSIT_ENV="csit-${OS_VERSION}-environment.yaml"
else
CSIT_ENV="csit-environment.yaml"
fi
diff --git a/jjb/releng/opnfv-utils.yaml b/jjb/releng/opnfv-utils.yaml
index 3c5c07bb5..457f7dc2b 100644
--- a/jjb/releng/opnfv-utils.yaml
+++ b/jjb/releng/opnfv-utils.yaml
@@ -28,7 +28,6 @@
- arm-build3
- arm-build4
- arm-build5
- - arm-build6
- ericsson-build3
- ericsson-build4
- lf-build2