diff options
| author |   Tim Rozet <trozet@redhat.com> | 2018-05-31 14:08:43 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2018-05-31 14:08:43 -0400 |
| commit | 120134ba064a0eb8865aaef7a30a129ebfe7d72d (patch) | |
| tree | d3601c953ba7e861f2f5adceb317623fb2b8923b | |
| parent | a5ada7e9390cb87b858a29370a7dc09507c07c2e (diff) | |
Apex: Parameterize functest suite/testcase
This patch parameterizes the functest variables for the apex-virtual job
so that we can indicate which tests to run when calling the apex-virtual
(which in turn runs deploy and functest).
Change-Id: Ic628c7711aca2d3ac0520d34150a3242d8d9891d
Signed-off-by: Tim Rozet <trozet@redhat.com>
| -rw-r--r-- | jjb/apex/apex-verify-jobs.yaml | 2 | ||||
| -rw-r--r-- | jjb/apex/apex.yaml | 6 | ||||
| -rw-r--r-- | jjb/apex/apex.yaml.j2 | 6 |
3 files changed, 12 insertions, 2 deletions
diff --git a/jjb/apex/apex-verify-jobs.yaml b/jjb/apex/apex-verify-jobs.yaml index f8e967bd0..8140d9ef5 100644 --- a/jjb/apex/apex-verify-jobs.yaml +++ b/jjb/apex/apex-verify-jobs.yaml @@ -243,6 +243,8 @@ GERRIT_REFSPEC=$GERRIT_REFSPEC GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE + FUNCTEST_SUITE_NAME=healthcheck + FUNCTEST_MODE=tier node-parameters: false kill-phase-on: FAILURE abort-all-job: true diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml index e61c0bf9d..bb5b53d6d 100644 --- a/jjb/apex/apex.yaml +++ b/jjb/apex/apex.yaml @@ -368,6 +368,7 @@ parameters: - '{project}-defaults' - '{project}-virtual-{stream}-defaults' + - 'functest-suite-parameter' - project-parameter: project: '{project}' branch: '{branch}' @@ -427,7 +428,8 @@ current-parameters: false predefined-parameters: | DEPLOY_SCENARIO=$DEPLOY_SCENARIO - FUNCTEST_SUITE_NAME=healthcheck + FUNCTEST_MODE=$FUNCTEST_MODE + FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC=$GERRIT_REFSPEC GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER @@ -819,6 +821,8 @@ GERRIT_REFSPEC=$GERRIT_REFSPEC GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE + FUNCTEST_SUITE_NAME=tempest_smoke_serial + FUNCTEST_MODE=testcase node-parameters: true kill-phase-on: FAILURE abort-all-job: true diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2 index 34611a75a..3397f1ed2 100644 --- a/jjb/apex/apex.yaml.j2 +++ b/jjb/apex/apex.yaml.j2 @@ -248,6 +248,7 @@ parameters: - '{project}-defaults' - '{project}-virtual-{stream}-defaults' + - 'functest-suite-parameter' - project-parameter: project: '{project}' branch: '{branch}' @@ -307,7 +308,8 @@ current-parameters: false predefined-parameters: | DEPLOY_SCENARIO=$DEPLOY_SCENARIO - FUNCTEST_SUITE_NAME=healthcheck + FUNCTEST_MODE=$FUNCTEST_MODE + FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC=$GERRIT_REFSPEC GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER @@ -699,6 +701,8 @@ GERRIT_REFSPEC=$GERRIT_REFSPEC GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE + FUNCTEST_SUITE_NAME=tempest_smoke_serial + FUNCTEST_MODE=testcase node-parameters: true kill-phase-on: FAILURE abort-all-job: true |