Add JJB template for ODL deployment for E/// lab
Remove stacklight component from E/// lab
MOSSUST-109
Change-Id: I30b0bd104b8da22bdcd65f8cbfad3b42b96fd904
diff --git a/jobs/project.yaml b/jobs/project.yaml
index 3e0f38c..5f0761f 100644
--- a/jobs/project.yaml
+++ b/jobs/project.yaml
@@ -20,8 +20,8 @@
- bm-cicd-queens-ovs-maas
- heat-bm-cicd-pike-contrail-sl
- heat-bm-cicd-queens-contrail-sl
- - bm-e7-cicd-pike-ovs-maas:
- disabled: false
+ - bm-e7-cicd-pike-ovs-maas
+ - bm-e7-cicd-pike-odl-maas
- released-bm-pike-ovs
# --- Released envs ------
- deploy-released:
diff --git a/jobs/templates/bm-e7-cicd-pike-odl-maas.yml b/jobs/templates/bm-e7-cicd-pike-odl-maas.yml
new file mode 100644
index 0000000..617b5c5
--- /dev/null
+++ b/jobs/templates/bm-e7-cicd-pike-odl-maas.yml
@@ -0,0 +1,213 @@
+- job-template:
+ project-type: pipeline
+ description: '{job-description}'
+ concurrent: true
+ disabled: false
+ name: bm-e7-cicd-pike-odl-maas
+ parameters:
+ - string:
+ default: 10.167.11.220
+ description: 'Ip for ODL controller'
+ name: ODL_CONTROLLER_IP
+ trim: 'false'
+ - string:
+ default: bm-e7-cicd-pike-odl-maas
+ description: ''
+ name: LAB_CONFIG_NAME
+ trim: 'false'
+ - string:
+ default: core,kvm,cicd,openstack
+ 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: ""
+ 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: 2019.2.0
+ 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: bm-e7-cicd-pike-odl-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/heads/release/2019.2.0
+ description: reference to patchset in pipeline-library
+ name: PIPELINE_LIBRARY_REF
+ trim: 'false'
+ - string:
+ default: refs/heads/release/2019.2.0
+ description: reference to patchset in mk-pipelines
+ name: MK_PIPELINES_REF
+ trim: 'false'
+ - string:
+ default: release/2019.2.0
+ description: Can be 'master' or 'proposed'. If empty, then takes ${{MCP_VERSION}}
+ value
+ name: COOKIECUTTER_TEMPLATE_COMMIT
+ trim: 'false'
+ - string:
+ default: release/2019.2.0
+ 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"
+ description: |-
+ Pytest option -k or -m, with expression to select necessary tests.
+ Additional pytest options are allowed.
+ 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_PIKE]Tempest'
+ description: ''
+ name: TEMPEST_TEST_SUITE_NAME
+ trim: 'false'
+ - string:
+ default: pike
+ description: ''
+ name: TEMPEST_IMAGE_VERSION
+ trim: 'false'
+ - string:
+ default: proposed
+ 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://ic-eu.ssl.mirantis.net:5000/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.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: release/2019.2.0
+ description: ''
+ name: JENKINS_PIPELINE_BRANCH
+ trim: 'false'
+ - string:
+ default: refs/heads/release/2019.2.0
+ description: ''
+ name: MCP_COMMON_SCRIPTS_REFS
+ trim: 'false'
+ - string:
+ default: proposed
+ description: ''
+ name: UPDATE_VERSION
+ trim: 'false'
+ - string:
+ name: IPMI_CREDS
+ default: 'e_lab_engineer'
+ - string:
+ default: ''
+ description: ''
+ name: BATCH_SIZE
+ trim: 'false'
+ - bool:
+ default: true
+ description: Whether to perform dist-upgrade on virtual nodes during deployment
+ name: DIST_UPGRADE_NODES
+ - bool:
+ default: true
+ 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
+ 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
+
diff --git a/jobs/templates/bm-e7-cicd-pike-ovs-maas.yml b/jobs/templates/bm-e7-cicd-pike-ovs-maas.yml
index 69285dd..c1dde4a 100644
--- a/jobs/templates/bm-e7-cicd-pike-ovs-maas.yml
+++ b/jobs/templates/bm-e7-cicd-pike-ovs-maas.yml
@@ -11,7 +11,7 @@
name: LAB_CONFIG_NAME
trim: 'false'
- string:
- default: core,kvm,cicd,openstack,ovs,stacklight
+ default: core,kvm,cicd,openstack,ovs
description: Comma-separated list of stacks to deploy the drivetrain (salt
cluster and cicd nodes)
name: DRIVETRAIN_STACK_INSTALL
@@ -92,7 +92,7 @@
name: SALT_MODELS_SYSTEM_COMMIT
trim: 'false'
- string:
- default: -m "run_cvp_func_sanity|run_cvp_tempest|run_stacklight"
+ default: -m "run_cvp_func_sanity|run_cvp_tempest"
description: |-
Pytest option -k or -m, with expression to select necessary tests.
Additional pytest options are allowed.