Add released bm-queens configuration
Releated_Prod: PROD-36426
Change-Id: Icb35bb366878c5af51c590a0c06badbf21ba0bff
diff --git a/jobs/pipelines/deploy-cicd-and-run-tests.groovy b/jobs/pipelines/deploy-cicd-and-run-tests.groovy
index c01a820..002c421 100644
--- a/jobs/pipelines/deploy-cicd-and-run-tests.groovy
+++ b/jobs/pipelines/deploy-cicd-and-run-tests.groovy
@@ -262,7 +262,12 @@
tcp_tests/tests/system/test_cvp_pipelines.py::TestCvpPipelines::test_run_cvp_stacklight
"""
if (env.IPMI_CREDS) {
- upgrade_job = "mcp-update-bm-b300-queens-ovs-maas"
+ if (env.ENV_NAME == "released-bm-b300-cicd-queens-ovs-maas") {
+ upgrade_job = "mcp-update-bm-b300-queens-ovs-maas"
+ }
+ if (env.ENV_NAME == "released-bm-cicd-queens-ovs-cl-maas") {
+ upgrade_job = "mcp-update-bm-queens-ovs-cl-maas"
+ }
}
def deploy = build job: "${upgrade_job}",
parameters: [
diff --git a/jobs/project.yaml b/jobs/project.yaml
index 60ac4ca..27a7d3b 100644
--- a/jobs/project.yaml
+++ b/jobs/project.yaml
@@ -31,6 +31,7 @@
- bm-b300-cicd-queens-ovs-maas
- released-bm-b300-cicd-queens-ovs-maas
- released-bm-pike-ovs
+ - released-bm-cicd-queens-ovs-cl-maas
# --- Released envs ------
- deploy-released:
disabled: false
diff --git a/jobs/templates/released-bm-cicd-queens-ovs-cl-maas.yml b/jobs/templates/released-bm-cicd-queens-ovs-cl-maas.yml
new file mode 100644
index 0000000..de00bee
--- /dev/null
+++ b/jobs/templates/released-bm-cicd-queens-ovs-cl-maas.yml
@@ -0,0 +1,258 @@
+- job-template:
+ project-type: pipeline
+ description: '{job-description}'
+ concurrent: true
+ disabled: false
+ name: released-bm-cicd-queens-ovs-cl-maas
+ parameters:
+ - string:
+ default: bm-cicd-queens-ovs-cl-maas
+ description: ''
+ name: LAB_CONFIG_NAME
+ trim: 'false'
+ - string:
+ default: core,kvm,cicd
+ description: Comma-separated list of stacks to deploy the drivetrain (salt
+ cluster and cicd nodes)
+ name: DRIVETRAIN_STACK_INSTALL
+ trim: 'false'
+ - string:
+ default: '24000'
+ description: ''
+ name: DRIVETRAIN_STACK_INSTALL_TIMEOUT
+ trim: 'false'
+ - string:
+ default: openstack,ovs,ceph,stacklight
+ description: Comma-separated list of stacks to deploy the target platform
+ (openstack and additional components)
+ name: PLATFORM_STACK_INSTALL
+ trim: 'false'
+ - string:
+ default: '24000'
+ description: ''
+ name: PLATFORM_STACK_INSTALL_TIMEOUT
+ trim: 'false'
+ - string:
+ default: "{previous-version}"
+ description: ''
+ name: MCP_VERSION
+ trim: 'false'
+ - string:
+ default: sre-team-infra
+ description: ''
+ name: NODE_NAME
+ trim: 'false'
+ - string:
+ default: /home/jenkins/images/ubuntu-16-04-x64-mcp2019.2.0.qcow2
+ description: ''
+ name: MCP_IMAGE_PATH1604
+ trim: 'false'
+ - string:
+ default: /home/jenkins/images/cfg01-day01.qcow2
+ description: ''
+ name: IMAGE_PATH_CFG01_DAY01
+ trim: 'false'
+ - string:
+ 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'
+ - string:
+ default: released-bm-cicd-queens-ovs-cl-maas
+ description: ''
+ name: ENV_NAME
+ trim: 'false'
+ - string:
+ default: ''
+ description: |-
+ Example: refs/changes/89/411189/36
+ (for now - only one reference allowed)
+ name: TCP_QA_REFS
+ trim: 'false'
+ - string:
+ default: refs/tags/{previous-version}
+ description: reference to patchset in pipeline-library
+ name: PIPELINE_LIBRARY_REF
+ trim: 'false'
+ - string:
+ default: refs/tags/{previous-version}
+ description: reference to patchset in mk-pipelines
+ name: MK_PIPELINES_REF
+ trim: 'false'
+ - string:
+ default: refs/tags/{previous-version}
+ description: Can be 'master' or 'proposed'. If empty, then takes ${{MCP_VERSION}}
+ value
+ name: COOKIECUTTER_TEMPLATE_COMMIT
+ trim: 'false'
+ - string:
+ default: refs/tags/{previous-version}
+ description: Can be 'master' or 'proposed'. If empty, then takes ${{MCP_VERSION}}
+ value
+ name: SALT_MODELS_SYSTEM_COMMIT
+ trim: 'false'
+ - string:
+ 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.
+ Procedure according to https://docs.mirantis.com/mcp/q4-18/mcp-release-notes/mu/mu-7/mu-7-apply-updates.html
+ name: RUN_TEST_OPTS
+ trim: 'false'
+ - bool:
+ default: true
+ description: ''
+ name: SHUTDOWN_ENV_ON_TEARDOWN
+ - string:
+ default: ''
+ description: ''
+ name: COOKIECUTTER_REF_CHANGE
+ trim: 'false'
+ - string:
+ default: ''
+ description: ''
+ name: ENVIRONMENT_TEMPLATE_REF_CHANGE
+ trim: 'false'
+ - string:
+ default: '[MCP1.1_QUEENS]Tempest'
+ description: ''
+ name: TEMPEST_TEST_SUITE_NAME
+ trim: 'false'
+ - string:
+ default: queens
+ description: ''
+ name: TEMPEST_IMAGE_VERSION
+ trim: 'false'
+ - string:
+ default: ''
+ description: ''
+ name: TEMPEST_TARGET
+ trim: 'false'
+ - string:
+ default: ''
+ description: ''
+ name: UPDATE_REPO_CUSTOM_TAG
+ trim: 'false'
+ - bool:
+ default: true
+ description: If set, reports will be created in TestRail for this build
+ name: REPORT_TO_TESTRAIL
+ - choice:
+ choices:
+ - heat
+ - devops
+ description: ''
+ name: ENV_MANAGER
+ - string:
+ default: https://keystone.ic-eu.ssl.mirantis.net/v3
+ description: 'Openstack keystone catalog endpoint, for example https://10.90.0.80:5000/v3'
+ name: OS_AUTH_URL
+ trim: 'false'
+ - string:
+ default: sre-team
+ description: OpenStack project (tenant) name
+ name: OS_PROJECT_NAME
+ trim: 'false'
+ - string:
+ default: default
+ description: OpenStack user domain name
+ name: OS_USER_DOMAIN_NAME
+ trim: 'false'
+ - string:
+ default: sre-qa-ci-eu
+ description: Jenkins credentials ID with username and password to create a
+ heat stack in OpenStack
+ name: OS_CREDENTIALS
+ trim: 'false'
+ - string:
+ default: eu-cloud-low-flavors.env
+ description: |-
+ 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: refs/tags/{previous-version}
+ description: ''
+ name: JENKINS_PIPELINE_BRANCH
+ trim: 'false'
+ - string:
+ default: set=smoke
+ description: ''
+ name: TEMPEST_PATTERN
+ trim: 'false'
+ - string:
+ default: refs/tags/{previous-version}
+ description: ''
+ name: MCP_COMMON_SCRIPTS_REFS
+ trim: 'false'
+ - string:
+ default: "{previous-version}"
+ description: 'for formula repo http://mirror.mirantis.com/update/UPDATE_VERSION/salt-formulas/xenial'
+ name: UPDATE_VERSION
+ trim: 'false'
+ - string:
+ name: UPDATES_MIRANTIS_VERSION
+ default: 'stable'
+ description: |
+ Overwrite subsection of updates.mirantis.com repository.
+ Effective only if enabled in cookiecutter context!
+ - string:
+ name: IPMI_CREDS
+ default: 'lab_engineer'
+ - string:
+ default: ''
+ description: ''
+ name: TEMPEST_EXTRA_ARGS
+ trim: 'false'
+ - string:
+ name: CISCO_PASS
+ default: '1fac0DlhILBo'
+ - string:
+ default: ''
+ description: ''
+ name: SALT_MODELS_SYSTEM_REF_CHANGE
+ trim: 'false'
+ - string:
+ default: ''
+ description: ''
+ name: BATCH_SIZE
+ trim: 'false'
+ - bool:
+ default: false
+ description: Whether to perform dist-upgrade on virtual nodes during deployment
+ name: DIST_UPGRADE_NODES
+ - bool:
+ default: false
+ description: 'Works starting from MCP 2019.2.10 or master. Whether to apply saltstack updates on all nodes in cluster before deployment'
+ name: UPGRADE_SALTSTACK
+ - bool:
+ name: RUN_UPGRADE_AFTER_JOB
+ default: true
+ description: "Upgrade and test after deploy?"
+ - bool:
+ name: UPGRADE_TO_TAG
+ default: '{upgrade-to-tag}'
+ description: "Upgrade to new tag"
+ - string:
+ name: UPGRADE_VERSION_TAG
+ default: "{current-version}"
+ description: 'Only works in conjunction with UPGRADE_TO_TAG and must be younger than the deployed version.'
+ trim: 'false'
+ - text:
+ default: ''
+ description: |-
+ Add env vars for deploy and testing
+ name: EXTRA_VARS
+ trim: 'false'
+ pipeline-scm:
+ lightweight-checkout: false
+ scm:
+ - git:
+ branches:
+ - FETCH_HEAD
+ refspec: ${{TCP_QA_REFS}}
+ url: https://gerrit.mcp.mirantis.com/mcp/tcp-qa
+ script-path: jobs/pipelines/deploy-cicd-and-run-tests.groovy
+ logrotate:
+ daysToKeep: 365
diff --git a/jobs/templates/test-scenarios.yml b/jobs/templates/test-scenarios.yml
index 6a45508..c973927 100644
--- a/jobs/templates/test-scenarios.yml
+++ b/jobs/templates/test-scenarios.yml
@@ -158,6 +158,14 @@
tempest_test_suite: "[MCP1.1_QUEENS]Tempest"
passed_steps: "hardware,create_model,salt,core,kvm,cicd,openstack,ovs,ceph,stacklight"
+ - mcp-update-bm-queens-ovs-cl-maas:
+ deployment: released-bm-cicd-queens-ovs-cl-maas
+ run-test-opts: '{test-opt}'
+ tempest_pattern: 'tempest'
+ display-name: MCP update (queens + MAAS)
+ tempest_test_suite: "[MCP1.1_QUEENS]Tempest"
+ passed_steps: "hardware,create_model,salt,core,kvm,cicd,openstack,ovs,ceph,stacklight"
+
- mcp-update-pike-dvr-sl:
deployment: released-heat-cicd-pike-dvr-sl
run-test-opts: '{test-opt}'