Merge "Shaker CVP tests"
diff --git a/generate-cookiecutter-products.groovy b/generate-cookiecutter-products.groovy
index c619ce2..6f07593 100644
--- a/generate-cookiecutter-products.groovy
+++ b/generate-cookiecutter-products.groovy
@@ -37,8 +37,8 @@
}
}
if ("${context['salt_master_hostname']}.${context['cluster_domain']}".length() > 64) {
- common.errorMsg("Cluster domain has too long name. Make ${context['cluster_domain']} shorter than 58 symbols.")
- error('Invalid context provided')
+ common.errorMsg("Cluster domain has too long name. Make ${context['cluster_domain']} shorter than 58 symbols.")
+ error('Invalid context provided')
}
// Use mcpVersion git tag if not specified branch for cookiecutter-templates
if (!context.get('cookiecutter_template_branch')) {
@@ -152,18 +152,18 @@
Name-Real: ${context['salt_master_hostname']}.${context['cluster_domain']}
Name-Email: ${secretKeyID}
""".stripIndent()
- writeFile file:'gpg-batch.txt', text:batchData
+ writeFile file: 'gpg-batch.txt', text: batchData
sh "gpg --gen-key --batch < gpg-batch.txt"
sh "gpg --export-secret-key -a ${secretKeyID} > gpgkey.asc"
} else {
- writeFile file:'gpgkey.asc', text:context['secrets_encryption_private_key']
+ writeFile file: 'gpgkey.asc', text: context['secrets_encryption_private_key']
sh "gpg --import gpgkey.asc"
secretKeyID = sh(returnStdout: true, script: 'gpg --list-secret-keys --with-colons | awk -F: -e "/^sec/{print \\$5; exit}"').trim()
}
context['secrets_encryption_key_id'] = secretKeyID
}
if (context.get('cfg_failsafe_ssh_public_key')) {
- writeFile file:'failsafe-ssh-key.pub', text:context['cfg_failsafe_ssh_public_key']
+ writeFile file: 'failsafe-ssh-key.pub', text: context['cfg_failsafe_ssh_public_key']
}
python.setupCookiecutterVirtualenv(cutterEnv)
// FIXME refactor generateModel
@@ -175,6 +175,10 @@
stage("Test") {
if (runTestModel) {
sh("cp -r ${modelEnv} ${testEnv}")
+ if (fileExists('gpgkey.asc')) {
+ common.infoMsg('gpgkey.asc found!Copy it into reclass folder for tests..')
+ sh("cp -v gpgkey.asc ${testEnv}/salt_master_pillar.asc")
+ }
def DockerCName = "${env.JOB_NAME.toLowerCase()}_${env.BUILD_TAG.toLowerCase()}"
common.infoMsg("Attempt to run test against distribRevision: ${distribRevision}")
try {
diff --git a/test-drivetrain.groovy b/test-drivetrain.groovy
deleted file mode 100644
index c421c17..0000000
--- a/test-drivetrain.groovy
+++ /dev/null
@@ -1,129 +0,0 @@
-/**
- *
- * Test Drivetrain pipeline
- *
- * Expected parameters:
- * COOKIECUTTER_TEMPLATE_CONTEXT Template context for CookieCutter
- * SOURCE_MCP_VERSION MCP version to start with
- * TARGET_MCP_VERSION MCP version to upgrade to
- * FUNC_TEST_SETTINGS Settings for functional tests
- * ENVIRONMENT_IP IP of already deployed environment
- * DELETE_STACK Option to delete Heat Stack
- */
-
-
-common = new com.mirantis.mk.Common()
-salt = new com.mirantis.mk.Salt()
-test = new com.mirantis.mk.Test()
-python = new com.mirantis.mk.Python()
-
-pepperEnv = "pepperEnv"
-
-def setupPepperVirtualenv(path, url, creds) {
- requirements = ['salt-pepper>=0.5.2,<0.5.4']
- python.setupVirtualenv(path, 'python2', requirements, null, true, true)
- rcFile = "${path}/pepperrc"
- rc = """\
-[main]
-SALTAPI_EAUTH=pam
-SALTAPI_URL=${url}
-SALTAPI_USER=${creds.username}
-SALTAPI_PASS=${creds.password}
-"""
- writeFile file: rcFile, text: rc
- return rcFile
-}
-
-def runJobOnJenkins(jenkinsUrl, userName, password, jobName, parameters){
- def status = "null"
- def jenkinsDownCmd = "curl -OL ${jenkinsUrl}/jnlpJars/jenkins-cli.jar --output ./jenkins-cli.jar"
- def runJobFromSaltMasterCmd = "java -jar jenkins-cli.jar -s ${jenkinsUrl} -noKeyAuth -auth ${userName}:${password} build ${jobName} ${parameters} -w"
- def waitJobFromSaltMasterCmd = "curl -s -X GET '${jenkinsUrl}/job/${jobName}/lastBuild/api/json?tree=result' --user ${userName}:${password} | jq -r '.result'"
- salt.cmdRun(pepperEnv, "I@salt:master", jenkinsDownCmd)
- salt.cmdRun(pepperEnv, "I@salt:master", runJobFromSaltMasterCmd)
- while (status == "null" || status.contains("parse error")){
- status = salt.cmdRun(pepperEnv, "I@salt:master", waitJobFromSaltMasterCmd, false)
- status = status.get("return")[0].values()[0].trim()
- println("The job ${jobName} result is $status")
- if(status == "FAILURE"){
- throw new Exception("The job ${jobName} result is FAILURE.")
- }
- sleep(10)
- }
-}
-
-timeout(time: 12, unit: 'HOURS') {
- node("python") {
- try {
- def mcpEnvJob
- def saltReturn
- def saltCreds = [:]
- def mcpEnvJobIP
-
- stage('Trigger deploy job') {
- if(ENVIRONMENT_IP == ""){
- mcpEnvJob = build(job: "create-mcp-env", parameters: [
- [$class: 'StringParameterValue', name: 'OS_AZ', value: 'mcp-mk'],
- [$class: 'StringParameterValue', name: 'OS_PROJECT_NAME', value: 'mcp-mk'],
- [$class: 'StringParameterValue', name: 'STACK_NAME', value: 'jenkins-drivetrain-test-' + currentBuild.number],
- [$class: 'StringParameterValue', name: 'STACK_INSTALL', value: 'core,cicd'],
- [$class: 'BooleanParameterValue', name: 'STACK_FULL', value: false],
- [$class: 'BooleanParameterValue', name: 'RUN_TESTS', value: false],
- [$class: 'TextParameterValue', name: 'COOKIECUTTER_TEMPLATE_CONTEXT', value: COOKIECUTTER_TEMPLATE_CONTEXT]
- ])
- def mcpEnvJobDesc = mcpEnvJob.getDescription().tokenize(" ")
- mcpEnvJobIP = mcpEnvJobDesc[2]
- }else{
- mcpEnvJobIP = ENVIRONMENT_IP
- }
- }
-
- def saltMasterUrl = "http://${mcpEnvJobIP}:6969"
- def script = "println(com.cloudbees.plugins.credentials.CredentialsProvider.lookupCredentials(com.cloudbees.plugins.credentials.common.StandardUsernamePasswordCredentials.class,jenkins.model.Jenkins.instance).findAll {cred -> cred.id == 'salt'}[0].password)"
- def saltPasswd = sh(returnStdout: true, script: "curl -d \"script=${script}\" --user admin:r00tme http://${mcpEnvJobIP}:8081/scriptText")
- saltPasswd = saltPasswd.trim()
- saltCreds.put("username", "salt")
- saltCreds.put("password", saltPasswd)
- setupPepperVirtualenv(pepperEnv, saltMasterUrl, saltCreds)
- saltReturn = salt.getPillar(pepperEnv, 'I@jenkins:client and not I@salt:master', '_param:openldap_admin_password')
- def stackCicdPassword = saltReturn.get("return")[0].values()[0]
- saltReturn = salt.getPillar(pepperEnv, 'I@jenkins:client and not I@salt:master', 'jenkins:client:master:host')
- def stackCicdAddr = saltReturn.get("return")[0].values()[0]
- def jenkinsUrl = "http://${stackCicdAddr}:8081"
-
- salt.cmdRun(pepperEnv, "I@salt:master", 'cd /srv/salt/reclass && echo -e ".gitignore\\nclasses/service/\\nnodes/_generated/" >> .gitignore')
- salt.cmdRun(pepperEnv, "I@salt:master", "cd /srv/salt/reclass && git reset --hard")
- salt.cmdRun(pepperEnv, "I@salt:master", "cd /srv/salt/reclass/classes/system && git reset --hard && git clean -fd")
-
- //TODO: Temporary fix. Remove the line below after 2a3757a (reclass-system) is in stable tag.
- salt.cmdRun(pepperEnv, "cid*", "mkdir /etc/aptly", false)
-
- stage('Run CVP before upgrade') {
- runJobOnJenkins(jenkinsUrl, "admin", stackCicdPassword, "cvp-sanity", "-p TESTS_SET=cvp-sanity-checks/cvp_checks/tests/test_drivetrain.py -p TESTS_SETTINGS='drivetrain_version=\"${SOURCE_MCP_VERSION}\"'")
- //TODO: Enable functional tests after they become implemented.
- //runJobOnJenkins(jenkinsUrl, "admin", stackCicdPassword, "cvp-dt-func", "-p SETTINGS=${FUNC_TEST_SETTINGS}")
- }
-
- stage('Run Upgrade on DriveTrain') {
- runJobOnJenkins(jenkinsUrl, "admin", stackCicdPassword, "upgrade-mcp-release", "-p MCP_VERSION=${TARGET_MCP_VERSION}")
- }
-
- stage('Run CVP after upgrade') {
- runJobOnJenkins(jenkinsUrl, "admin", stackCicdPassword, "cvp-sanity", "-p TESTS_SET=cvp-sanity-checks/cvp_checks/tests/test_drivetrain.py -p TESTS_SETTINGS='drivetrain_version=\"${TARGET_MCP_VERSION}\"'")
- //TODO: Enable functional tests after they become implemented.
- //runJobOnJenkins(jenkinsUrl, "admin", stackCicdPassword, "cvp-dt-func", "-p SETTINGS=${FUNC_TEST_SETTINGS}")
- }
-
- } catch (Throwable e) {
- currentBuild.result = 'FAILURE'
- throw e
- } finally{
- if(DELETE_STACK.toBoolean() && ENVIRONMENT_IP == ""){
- mcpEnvJob = build(job: "delete-heat-stack-for-mcp-env", wait: false, parameters: [
- [$class: 'StringParameterValue', name: 'OS_PROJECT_NAME', value: 'mcp-mk'],
- [$class: 'StringParameterValue', name: 'STACK_NAME', value: 'jenkins-drivetrain-test-' + currentBuild.number],
- ])
- }
- }
- }
-}