Fixes for test scenarios
PROD-36273
Change-Id: I135d9fed6d4c750ea6b03cb51c6b54d3820913d6
diff --git a/jobs/pipelines/run-test-scenarios.groovy b/jobs/pipelines/run-test-scenarios.groovy
index f62825f..31aff06 100644
--- a/jobs/pipelines/run-test-scenarios.groovy
+++ b/jobs/pipelines/run-test-scenarios.groovy
@@ -48,12 +48,13 @@
}
} catch (e) {
common.printMsg("Tests are failed: " + e.message, "purple")
+ currentBuild.result = 'FAILURE'
}
} // stage("Run tests")
stage("Archive all xml reports") {
dir("${env.slave_workdir }") {
- archiveArtifacts artifacts: "**/*.xml,**/*.ini,**/*.log,**/*.tar.gz"
+ archiveArtifacts artifacts: "**/*.xml,**/*.log"
}
}
diff --git a/jobs/templates/test-scenarios.yml b/jobs/templates/test-scenarios.yml
index 730341e..6b54a3c 100644
--- a/jobs/templates/test-scenarios.yml
+++ b/jobs/templates/test-scenarios.yml
@@ -65,14 +65,17 @@
- backup-saltmaster-queens-dvr-sl:
run-test-opts: '-k TestBackupRestoreMaster'
deployment: heat-cicd-queens-dvr-sl
+ display-name: Backup/Restore SaltMaster (queens)
- backup-saltmaster-pike-dvr-sl:
run-test-opts: '-k TestBackupRestoreMaster'
deployment: heat-cicd-pike-dvr-sl
+ display-name: Backup/Restore SaltMaster (pike)
- backup-cassandra-queens-contrail-sl:
run-test-opts: '-k TestBackupRestoreCassandra'
deployment: heat-cicd-queens-contrail41-sl
+ display-name: Backup/restore Cassandra
jobs:
- '{test_scenario}'
@@ -81,8 +84,17 @@
name: 'ceph-tests'
test_scenario:
- ceph_osd-queens-dvr-sl:
- run-test-opts: '-k TestCephOsd'
- deployment: heat-cicd-queens-dvr-sl
+ run-test-opts: '-k TestCephOsd'
+ deployment: heat-cicd-queens-dvr-sl
+ display-name: Add/Remove OSD node
+ - ceph_cmn-queens-dvr-sl:
+ run-test-opts: '-k TestCephMon'
+ deployment: heat-cicd-queens-dvr-sl
+ display-name: Add/Remove CMN node
+ - ceph_mgr-queens-dvr-sl:
+ run-test-opts: '-k TestCephMgr'
+ deployment: heat-cicd-queens-dvr-sl
+ display-name: Add/Remove MGR node
jobs:
- '{test_scenario}'
@@ -119,30 +131,36 @@
deployment: released-heat-cicd-pike-dvr-sl
disabled: true
run-test-opts: '{test-opt}'
+ display-name: MCP update (pike)
- mcp-update-queens-dvr-sl:
deployment: released-heat-cicd-queens-dvr-sl
disabled: true
run-test-opts: '{test-opt}'
+ display-name: MCP update (queens)
- mcp-update-pike-contrail-sl:
deployment: released-heat-cicd-pike-contrail41-sl
disabled: true
run-test-opts: '{test-opt-with-contrail}'
+ display-name: MCP update (pike + OC)
- mcp-update-queens-contrail-sl:
deployment: released-heat-cicd-queens-contrail41-sl
disabled: true
run-test-opts: '{test-opt-with-contrail}'
+ display-name: MCP update (queens + OC)
- os-update-pike-to-queens:
deployment: heat-cicd-pike-dvr-sl
run-test-opts: '-k TestUpdatePikeToQueens'
+ display-name: Update Pike -> Queens
- ceph-update-luminous-to-nautilus:
deployment: heat-cicd-pike-dvr-sl
disabled: true
run-test-opts: '-k TestCephUpdate'
+ display-name: Update Ceph Luminous -> Nautilus
jobs:
- '{test_scenario}'
@@ -150,6 +168,7 @@
###################### JOB TEMPLATE ###################
- job-template:
name: '{test_scenario}'
+ display-name: '{display-name}'
project-type: pipeline
concurrent: false
disabled: '{disabled|false}'
@@ -192,12 +211,6 @@
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: 'openstack_slave_{deployment}'
description: 'Required: Name of the jenkins slave to create the environment
To be set by the parent deployment job.'
@@ -210,6 +223,11 @@
name: PARENT_WORKSPACE
trim: 'false'
- string:
+ default: '2019.2.0'
+ description: 'MCP version'
+ name: MCP_VERSION
+ trim: 'false'
+ - string:
default: ''
description: 'Completed steps to install components on the environment.
If tests require some additional components, it may be installed in