diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/cperf/cperf-ci-jobs.yml | 9 | ||||
| -rw-r--r-- | jjb/joid/joid-daily-jobs.yml | 4 | ||||
| -rw-r--r-- | jjb/qtip/qtip-validate-jobs.yml | 24 | ||||
| -rw-r--r-- | jjb/releng/opnfv-docker.yml | 3 |
4 files changed, 21 insertions, 19 deletions
diff --git a/jjb/cperf/cperf-ci-jobs.yml b/jjb/cperf/cperf-ci-jobs.yml index d1914f6f1..2742f08f7 100644 --- a/jjb/cperf/cperf-ci-jobs.yml +++ b/jjb/cperf/cperf-ci-jobs.yml @@ -13,6 +13,11 @@ branch: '{stream}' gs-pathname: '' docker-tag: 'latest' + danube: &danube + stream: danube + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + docker-tag: 'stable' #-------------------------------- # POD, INSTALLER, AND BRANCH MAPPING @@ -24,7 +29,9 @@ - intel-pod2: installer: apex <<: *master - + - intel-pod2: + installer: apex + <<: *danube #-------------------------------- testsuite: diff --git a/jjb/joid/joid-daily-jobs.yml b/jjb/joid/joid-daily-jobs.yml index 97e290c8a..8c69c8310 100644 --- a/jjb/joid/joid-daily-jobs.yml +++ b/jjb/joid/joid-daily-jobs.yml @@ -64,13 +64,13 @@ - 'os-odl_l2-nofeature-ha': auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger' - 'os-onos-nofeature-ha': - auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger' + auto-trigger-name: 'daily-trigger-disabled' - 'os-odl_l2-nofeature-noha': auto-trigger-name: 'daily-trigger-disabled' - 'os-onos-nofeature-noha': auto-trigger-name: 'daily-trigger-disabled' - 'os-onos-sfc-ha': - auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger' + auto-trigger-name: 'daily-trigger-disabled' - 'os-ocl-nofeature-ha': auto-trigger-name: 'daily-trigger-disabled' - 'os-ocl-nofeature-noha': diff --git a/jjb/qtip/qtip-validate-jobs.yml b/jjb/qtip/qtip-validate-jobs.yml index deaf525af..a850d6757 100644 --- a/jjb/qtip/qtip-validate-jobs.yml +++ b/jjb/qtip/qtip-validate-jobs.yml @@ -59,13 +59,19 @@ name: 'qtip-{task}-{installer}-{pod}-{stream}' disabled: false parameters: - - qtip-common-parameters: + - project-parameter: project: '{project}' branch: '{branch}' - docker-tag: '{docker-tag}' - '{installer}-defaults' - '{pod}-defaults' - string: + name: DEPLOY_SCENARIO + default: 'os-nosdn-nofeature-ha' + - string: + name: DOCKER_TAG + default: '{docker-tag}' + description: 'Tag to pull docker image' + - string: name: CI_DEBUG default: 'false' description: "Show debug output information" @@ -110,20 +116,6 @@ # parameter #----------- -- parameter: - name: qtip-common-parameters - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - string: - name: DEPLOY_SCENARIO - default: 'os-nosdn-nofeature-ha' - - string: - name: DOCKER_TAG - default: '{docker-tag}' - description: 'Tag to pull docker image' - #----------- # publisher #----------- diff --git a/jjb/releng/opnfv-docker.yml b/jjb/releng/opnfv-docker.yml index f69992156..3b7ec3478 100644 --- a/jjb/releng/opnfv-docker.yml +++ b/jjb/releng/opnfv-docker.yml @@ -53,6 +53,9 @@ - 'functest': <<: *danube <<: *functest-receivers + - 'qtip': + <<: *danube + <<: *other-receivers - 'storperf': <<: *danube <<: *other-receivers |