summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/apex/apex.yaml2
-rw-r--r--jjb/apex/apex.yaml.j22
-rw-r--r--jjb/functest/functest-daily-jobs.yaml3
3 files changed, 5 insertions, 2 deletions
diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml
index 33aec192e..7a9106e38 100644
--- a/jjb/apex/apex.yaml
+++ b/jjb/apex/apex.yaml
@@ -586,7 +586,7 @@
echo "DOCKER_TAG=hunter" > functest_scenario
else
functest_scenario=$DEPLOY_SCENARIO
- DOCKER_TAG=''
+ echo "DOCKER_TAG=''" > functest_scenario
fi
echo "DEPLOY_SCENARIO=$functest_scenario" >> functest_scenario
- inject:
diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2
index 281a09bf2..329d2c9f5 100644
--- a/jjb/apex/apex.yaml.j2
+++ b/jjb/apex/apex.yaml.j2
@@ -432,7 +432,7 @@
echo "DOCKER_TAG=hunter" > functest_scenario
else
functest_scenario=$DEPLOY_SCENARIO
- DOCKER_TAG=''
+ echo "DOCKER_TAG=''" > functest_scenario
fi
echo "DEPLOY_SCENARIO=$functest_scenario" >> functest_scenario
- inject:
diff --git a/jjb/functest/functest-daily-jobs.yaml b/jjb/functest/functest-daily-jobs.yaml
index 8d3883a0f..34aee8a9d 100644
--- a/jjb/functest/functest-daily-jobs.yaml
+++ b/jjb/functest/functest-daily-jobs.yaml
@@ -292,6 +292,9 @@
name: DEPLOY_SCENARIO
default: 'os-nosdn-nofeature-noha'
- string:
+ name: DOCKER_TAG
+ default: ''
+ - string:
name: CLEAN_DOCKER_IMAGES
default: 'false'
description: 'Remove downloaded docker images (opnfv/functest*:*)'