summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2018-10-21 10:39:18 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2018-10-21 10:39:32 +0200
commit5c575ac0657738442b06b8377d075ac00c51f5f2 (patch)
treefa67baeea2fd28a27c9248d827ba787ef420fab8 /jjb
parent015b7ca4dd3aa455de0e00c845fe1f04b16852b6 (diff)
Revert "Apex: Enable OS master clients with Tempest"
This reverts commit 2e1815d026f209e46fcc7eb29a7d4a28a48b2354. Change-Id: Idff665fdc88c0936bf7b4fb0bb895d90553ca835 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'jjb')
-rw-r--r--jjb/apex/apex-verify-jobs.yaml9
-rw-r--r--jjb/apex/apex.yaml9
-rw-r--r--jjb/apex/apex.yaml.j29
3 files changed, 0 insertions, 27 deletions
diff --git a/jjb/apex/apex-verify-jobs.yaml b/jjb/apex/apex-verify-jobs.yaml
index 854aefc7f..805fb7246 100644
--- a/jjb/apex/apex-verify-jobs.yaml
+++ b/jjb/apex/apex-verify-jobs.yaml
@@ -353,14 +353,6 @@
kill-phase-on: FAILURE
abort-all-job: true
git-revision: true
- - shell: |
- if echo $DEPLOY_SCENARIO | grep queens &> /dev/null; then
- echo 'REPO=opnfv' > functest_repo
- else
- echo 'REPO=ollivier' > functest_repo
- fi
- - inject:
- properties-file: functest_repo
- multijob:
name: functest-smoke
condition: ALWAYS
@@ -371,7 +363,6 @@
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
FUNCTEST_SUITE_NAME=tempest_smoke
FUNCTEST_MODE=testcase
- REPO=$REPO
GERRIT_BRANCH=$GERRIT_BRANCH
GERRIT_REFSPEC=$GERRIT_REFSPEC
GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml
index 15fab23c6..32dd2f749 100644
--- a/jjb/apex/apex.yaml
+++ b/jjb/apex/apex.yaml
@@ -475,14 +475,6 @@
kill-phase-on: FAILURE
abort-all-job: true
git-revision: true
- - shell: |
- if echo $DEPLOY_SCENARIO | grep queens &> /dev/null; then
- echo 'REPO=opnfv' > functest_repo
- else
- echo 'REPO=ollivier' > functest_repo
- fi
- - inject:
- properties-file: functest_repo
- multijob:
name: functest-smoke
condition: ALWAYS
@@ -493,7 +485,6 @@
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
FUNCTEST_MODE=$FUNCTEST_MODE
FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME
- REPO=$REPO
GERRIT_BRANCH=$GERRIT_BRANCH
GERRIT_REFSPEC=$GERRIT_REFSPEC
GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2
index 5c934c44d..455f198f1 100644
--- a/jjb/apex/apex.yaml.j2
+++ b/jjb/apex/apex.yaml.j2
@@ -321,14 +321,6 @@
kill-phase-on: FAILURE
abort-all-job: true
git-revision: true
- - shell: |
- if echo $DEPLOY_SCENARIO | grep queens &> /dev/null; then
- echo 'REPO=opnfv' > functest_repo
- else
- echo 'REPO=ollivier' > functest_repo
- fi
- - inject:
- properties-file: functest_repo
- multijob:
name: functest-smoke
condition: ALWAYS
@@ -339,7 +331,6 @@
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
FUNCTEST_MODE=$FUNCTEST_MODE
FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME
- REPO=$REPO
GERRIT_BRANCH=$GERRIT_BRANCH
GERRIT_REFSPEC=$GERRIT_REFSPEC
GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER