summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2018-10-22 12:11:41 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-10-22 12:11:41 +0000
commitd478df6bf4a1581f40daecf851006938d5e54905 (patch)
tree7008081d1e2b351c764ac0b7267f8c63b3901378
parentac064a646ce80514a7a8bb70ea452a64ad1f3f30 (diff)
parent5c575ac0657738442b06b8377d075ac00c51f5f2 (diff)
Merge "Revert "Apex: Enable OS master clients with Tempest""
-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 4d98189e9..3d72a363c 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 5ad652f9a..33e135c0c 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