Merge "Enable triggers for 2019.2.x-release-* jobs"
diff --git a/jobs/templates/2019.2.0-heat-cicd-pike-dvr-sl.yml b/jobs/templates/2019.2.0-heat-cicd-pike-dvr-sl.yml
index 3544485..51af147 100644
--- a/jobs/templates/2019.2.0-heat-cicd-pike-dvr-sl.yml
+++ b/jobs/templates/2019.2.0-heat-cicd-pike-dvr-sl.yml
@@ -4,6 +4,8 @@
concurrent: true
disabled: false
name: 2019.2.0-heat-cicd-pike-dvr-sl
+ triggers:
+ - timed: H(5-30) 22 * * 1-7
parameters:
- string:
default: heat-cicd-pike-dvr-sl
@@ -33,7 +35,7 @@
name: PLATFORM_STACK_INSTALL_TIMEOUT
trim: 'false'
- string:
- default: 2019.2.0
+ default: 2019.2.8
description: ''
name: MCP_VERSION
trim: 'false'
@@ -43,7 +45,7 @@
name: NODE_NAME
trim: 'false'
- string:
- default: /home/jenkins/images/ubuntu-16-04-x64-mcp2019.2.0.qcow2
+ default: '/home/jenkins/images/ubuntu-16-04-x64-mcp2019.2.0.qcow2'
description: ''
name: MCP_IMAGE_PATH1604
trim: 'false'
@@ -53,7 +55,7 @@
name: IMAGE_PATH_CFG01_DAY01
trim: 'false'
- string:
- default: cfg01.${{LAB_CONFIG_NAME}}-config-drive.iso
+ default: 'cfg01.${{LAB_CONFIG_NAME}}-config-drive.iso'
description: ISO name that will be generated and downloaded to the /home/jenkins/images/
name: CFG01_CONFIG_IMAGE_NAME
trim: 'false'
@@ -70,12 +72,12 @@
name: TCP_QA_REFS
trim: 'false'
- string:
- default: ''
+ default: 'refs/tags/2019.2.8'
description: reference to patchset in pipeline-library
name: PIPELINE_LIBRARY_REF
trim: 'false'
- string:
- default: ''
+ default: 'refs/tags/2019.2.8'
description: reference to patchset in mk-pipelines
name: MK_PIPELINES_REF
trim: 'false'
@@ -144,9 +146,7 @@
name: ENV_MANAGER
- string:
default: https://ic-eu.ssl.mirantis.net:5000/v3
- description: 'Openstack keystone catalog endpoint, for example https://10.90.0.80:5000/v3
-
- '
+ description: 'Openstack keystone catalog endpoint, for example https://10.90.0.80:5000/v3'
name: OS_AUTH_URL
trim: 'false'
- string:
@@ -168,12 +168,12 @@
- string:
default: eu-cloud.env
description: |-
- Heat template environment filename with 'parameter_defaults' dict, placed in tcp_tests/templates/_heat_environments/
- , for example: microcloud-8116.env
+ Heat template environment filename with 'parameter_defaults' dict, placed in tcp_tests/templates/_heat_environments/,
+ for example: microcloud-8116.env
name: LAB_PARAM_DEFAULTS
trim: 'false'
- string:
- default: ''
+ default: 'refs/tags/2019.2.8'
description: ''
name: JENKINS_PIPELINE_BRANCH
trim: 'false'
@@ -183,15 +183,19 @@
name: TEMPEST_PATTERN
trim: 'false'
- string:
- default: ''
+ default: 'refs/tags/2019.2.8'
description: ''
name: MCP_COMMON_SCRIPTS_REFS
trim: 'false'
- string:
- default: 2019.2.0
+ default: 2019.2.8
description: ''
name: UPDATE_VERSION
trim: 'false'
+ - bool:
+ default: false
+ description: Whether to perform dist-upgrade on virtual nodes during deployment
+ name: DIST_UPGRADE_NODES
pipeline-scm:
lightweight-checkout: false
scm:
@@ -199,6 +203,5 @@
branches:
- FETCH_HEAD
refspec: ${{TCP_QA_REFS}}
- url: https://gerrit.mcp.mirantis.com/mcp/tcp-qa
+ url: https://gerrit.mcp.mirantis.com/mcp/tcp-qa.git
script-path: jobs/pipelines/deploy-cicd-and-run-tests.groovy
-
diff --git a/jobs/templates/2019.2.0-heat-cicd-queens-contrail41-sl.yml b/jobs/templates/2019.2.0-heat-cicd-queens-contrail41-sl.yml
index 13c683c..e7f9752 100644
--- a/jobs/templates/2019.2.0-heat-cicd-queens-contrail41-sl.yml
+++ b/jobs/templates/2019.2.0-heat-cicd-queens-contrail41-sl.yml
@@ -4,6 +4,8 @@
concurrent: true
disabled: false
name: 2019.2.0-heat-cicd-queens-contrail41-sl
+ triggers:
+ - timed: H(5-30) 23 * * 1-7
parameters:
- string:
default: heat-cicd-queens-contrail41-sl
@@ -33,7 +35,7 @@
name: PLATFORM_STACK_INSTALL_TIMEOUT
trim: 'false'
- string:
- default: 2019.2.0
+ default: 2019.2.8
description: ''
name: MCP_VERSION
trim: 'false'
@@ -70,12 +72,12 @@
name: TCP_QA_REFS
trim: 'false'
- string:
- default: ''
+ default: 'refs/tags/2019.2.8'
description: reference to patchset in pipeline-library
name: PIPELINE_LIBRARY_REF
trim: 'false'
- string:
- default: ''
+ default: 'refs/tags/2019.2.8'
description: reference to patchset in mk-pipelines
name: MK_PIPELINES_REF
trim: 'false'
@@ -144,9 +146,7 @@
name: ENV_MANAGER
- string:
default: https://ic-eu.ssl.mirantis.net:5000/v3
- description: 'Openstack keystone catalog endpoint, for example https://10.90.0.80:5000/v3
-
- '
+ description: 'Openstack keystone catalog endpoint, for example https://10.90.0.80:5000/v3'
name: OS_AUTH_URL
trim: 'false'
- string:
@@ -168,30 +168,39 @@
- string:
default: eu-cloud.env
description: |-
- Heat template environment filename with 'parameter_defaults' dict, placed in tcp_tests/templates/_heat_environments/
- , for example: microcloud-8116.env
+ Heat template environment filename with 'parameter_defaults' dict, placed in tcp_tests/templates/_heat_environments/,
+ for example: microcloud-8116.env
name: LAB_PARAM_DEFAULTS
trim: 'false'
- string:
- default: ''
+ default: 'refs/tags/2019.2.8'
description: ''
name: JENKINS_PIPELINE_BRANCH
trim: 'false'
- string:
- default: ''
+ default: 'refs/tags/2019.2.8'
description: ''
name: MCP_COMMON_SCRIPTS_REFS
trim: 'false'
- string:
+ default: 2019.2.8
+ description: ''
+ name: UPDATE_VERSION
+ trim: 'false'
+ - string:
+ default: ''
+ description: ''
+ name: TEMPEST_EXTRA_ARGS
+ trim: 'false'
+ - string:
default: ^heat_tempest_plugin.tests*|^tempest.api.image*|^tempest_horizon*|^tempest.api.identity*|^tempest.api.network*|^tempest.api.compute*|^tempest.api.volume*|^tempest.scenario*|^tempest.api.object_storage*
description: Exclude tungsten tests by default
name: TEMPEST_PATTERN
trim: 'false'
- - string:
- default: 2019.2.0
- description: ''
- name: UPDATE_VERSION
- trim: 'false'
+ - bool:
+ default: false
+ description: Whether to perform dist-upgrade on virtual nodes during deployment
+ name: DIST_UPGRADE_NODES
pipeline-scm:
lightweight-checkout: false
scm:
@@ -199,6 +208,6 @@
branches:
- FETCH_HEAD
refspec: ${{TCP_QA_REFS}}
- url: https://gerrit.mcp.mirantis.com/mcp/tcp-qa
+ url: https://gerrit.mcp.mirantis.com/mcp/tcp-qa.git
script-path: jobs/pipelines/deploy-cicd-and-run-tests.groovy
- project-type: pipeline
+
diff --git a/jobs/templates/2019.2.0-heat-cicd-queens-dvr-sl.yml b/jobs/templates/2019.2.0-heat-cicd-queens-dvr-sl.yml
index 661b5b7..c629557 100644
--- a/jobs/templates/2019.2.0-heat-cicd-queens-dvr-sl.yml
+++ b/jobs/templates/2019.2.0-heat-cicd-queens-dvr-sl.yml
@@ -4,6 +4,8 @@
concurrent: true
disabled: false
name: 2019.2.0-heat-cicd-queens-dvr-sl
+ triggers:
+ - timed: H(5-30) 21 * * 1-7
parameters:
- string:
default: heat-cicd-queens-dvr-sl
@@ -33,7 +35,7 @@
name: PLATFORM_STACK_INSTALL_TIMEOUT
trim: 'false'
- string:
- default: 2019.2.0
+ default: 2019.2.8
description: ''
name: MCP_VERSION
trim: 'false'
@@ -43,7 +45,7 @@
name: NODE_NAME
trim: 'false'
- string:
- default: /home/jenkins/images/ubuntu-16-04-x64-mcp2019.2.0.qcow2
+ default: '/home/jenkins/images/ubuntu-16-04-x64-mcp2019.2.0.qcow2'
description: ''
name: MCP_IMAGE_PATH1604
trim: 'false'
@@ -53,7 +55,7 @@
name: IMAGE_PATH_CFG01_DAY01
trim: 'false'
- string:
- default: cfg01.${{LAB_CONFIG_NAME}}-config-drive.iso
+ default: 'cfg01.${{LAB_CONFIG_NAME}}-config-drive.iso'
description: ISO name that will be generated and downloaded to the /home/jenkins/images/
name: CFG01_CONFIG_IMAGE_NAME
trim: 'false'
@@ -70,12 +72,12 @@
name: TCP_QA_REFS
trim: 'false'
- string:
- default: ''
+ default: 'refs/tags/2019.2.8'
description: reference to patchset in pipeline-library
name: PIPELINE_LIBRARY_REF
trim: 'false'
- string:
- default: ''
+ default: 'refs/tags/2019.2.8'
description: reference to patchset in mk-pipelines
name: MK_PIPELINES_REF
trim: 'false'
@@ -92,7 +94,7 @@
name: SALT_MODELS_SYSTEM_COMMIT
trim: 'false'
- string:
- default: -m "run_cvp_func_sanity|run_tempest|run_stacklight"
+ default: -m "run_cvp_func_sanity|run_cvp_tempest|run_stacklight"
description: |-
Pytest option -k or -m, with expression to select necessary tests.
Additional pytest options are allowed.
@@ -144,9 +146,7 @@
name: ENV_MANAGER
- string:
default: https://ic-eu.ssl.mirantis.net:5000/v3
- description: 'Openstack keystone catalog endpoint, for example https://10.90.0.80:5000/v3
-
- '
+ description: 'Openstack keystone catalog endpoint, for example https://10.90.0.80:5000/v3'
name: OS_AUTH_URL
trim: 'false'
- string:
@@ -168,12 +168,12 @@
- string:
default: eu-cloud.env
description: |-
- Heat template environment filename with 'parameter_defaults' dict, placed in tcp_tests/templates/_heat_environments/
- , for example: microcloud-8116.env
+ Heat template environment filename with 'parameter_defaults' dict, placed in tcp_tests/templates/_heat_environments/,
+ for example: microcloud-8116.env
name: LAB_PARAM_DEFAULTS
trim: 'false'
- string:
- default: ''
+ default: 'refs/tags/2019.2.8'
description: ''
name: JENKINS_PIPELINE_BRANCH
trim: 'false'
@@ -183,15 +183,24 @@
name: TEMPEST_PATTERN
trim: 'false'
- string:
- default: ''
+ default: 'refs/tags/2019.2.8'
description: ''
name: MCP_COMMON_SCRIPTS_REFS
trim: 'false'
- string:
- default: 2019.2.0
+ default: 2019.2.8
description: ''
name: UPDATE_VERSION
trim: 'false'
+ - string:
+ default: ''
+ description: ''
+ name: TEMPEST_EXTRA_ARGS
+ trim: 'false'
+ - bool:
+ default: false
+ description: Whether to perform dist-upgrade on virtual nodes during deployment
+ name: DIST_UPGRADE_NODES
pipeline-scm:
lightweight-checkout: false
scm:
@@ -199,5 +208,5 @@
branches:
- FETCH_HEAD
refspec: ${{TCP_QA_REFS}}
- url: https://gerrit.mcp.mirantis.com/mcp/tcp-qa
+ url: https://gerrit.mcp.mirantis.com/mcp/tcp-qa.git
script-path: jobs/pipelines/deploy-cicd-and-run-tests.groovy