diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-04-13 12:12:53 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-04-13 12:12:53 +0000 |
| commit | e3fbbff296e2ff11cd6e84ab0164fefd2708c93b (patch) | |
| tree | 7a2ae284205c0d02647de0329db6415dc9554138 | |
| parent | cbc32fd99926ea20df148832776ec15a034f7f02 (diff) | |
| parent | c2e2b44e6f1a72658b0dcdb6cf03b737096565a0 (diff) | |
Merge "Apex, Functest: Enable smoke tests on Apex master verify"
| -rw-r--r-- | jjb/apex/apex.yml | 6 | ||||
| -rw-r--r-- | jjb/functest/functest-ci-jobs.yml | 5 | ||||
| -rw-r--r-- | jjb/opnfv/slave-params.yml | 23 |
3 files changed, 32 insertions, 2 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index ce60ed3b9..b48e81e8c 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -220,6 +220,12 @@ OPNFV_CLEAN=yes git-revision: false block: true + - trigger-builds: + - project: 'functest-apex-{slave}-suite-{stream1}' + predefined-parameters: | + DEPLOY_SCENARIO=os-nosdn-nofeature-ha + FUNCTEST_SUITE_NAME=vping_userdata + block: true - 'apex-workspace-cleanup' - job-template: diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml index 57f48109b..af79fbf75 100644 --- a/jjb/functest/functest-ci-jobs.yml +++ b/jjb/functest/functest-ci-jobs.yml @@ -67,7 +67,7 @@ - intel-pod8: installer: compass <<: *master - - opnfv-jump-1: + - intel-pod7: installer: apex <<: *master - ericsson-pod1: @@ -172,7 +172,8 @@ - 'promise' - 'doctor' - 'vims' - - 'vping' + - 'vping_userdata' + - 'vping_ssh' - parameter: name: functest-parameter parameters: diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml index 8ee4b0be6..e7f063c94 100644 --- a/jjb/opnfv/slave-params.yml +++ b/jjb/opnfv/slave-params.yml @@ -175,6 +175,29 @@ description: "External network to create for pod6 (name;type;first ip;last ip; gateway;network)" - parameter: + name: 'intel-pod7-defaults' + parameters: + - node: + name: SLAVE_NAME + description: 'Slave name on Jenkins' + allowed-slaves: + - intel-pod7 + default-slaves: + - intel-pod7 + - string: + name: INSTALLER_VERSION + default: latest + description: 'Version of the installer to deploy' + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on this Jenkins Slave' + - string: + name: SSH_KEY + default: /root/.ssh/id_rsa + description: 'SSH key to use for Apex' + +- parameter: name: 'intel-pod8-defaults' parameters: - node: |