Revert "[Generatemodel job] Send via mail only config-drive files"
This reverts commit 21ecf6424b26a544038fdaa2e737d58937aa6aba.
Related-Prod: PROD-29539 (PROD:29539)
Change-Id: Ie313132eeececb0abfeeab017b2320f9f31807ac
diff --git a/generate-cookiecutter-products.groovy b/generate-cookiecutter-products.groovy
index 49a1ac8..99ee3ea 100644
--- a/generate-cookiecutter-products.groovy
+++ b/generate-cookiecutter-products.groovy
@@ -317,9 +317,10 @@
]
sh "chmod 0755 create-config-drive.py ; ./create-config-drive.py ${args.join(' ')}"
}
+ sh("mkdir output-${context['cluster_name']} && mv ${context['salt_master_hostname']}.${context['cluster_domain']}-config.iso output-${context['cluster_name']}/")
// save cfg iso to artifacts
- archiveArtifacts artifacts: "${context['salt_master_hostname']}.${context['cluster_domain']}-config.iso"
+ archiveArtifacts artifacts: "output-${context['cluster_name']}/${context['salt_master_hostname']}.${context['cluster_domain']}-config.iso"
if (context['local_repositories'] == 'True') {
def aptlyServerHostname = context.aptly_server_hostname
@@ -348,22 +349,26 @@
]
sh "python ./create-config-drive.py ${args.join(' ')}"
}
+ sh("mv ${aptlyServerHostname}.${context['cluster_domain']}-config.iso output-${context['cluster_name']}/")
// save apt iso to artifacts
- archiveArtifacts artifacts: "${aptlyServerHostname}.${context['cluster_domain']}-config.iso"
+ archiveArtifacts artifacts: "output-${context['cluster_name']}/${aptlyServerHostname}.${context['cluster_domain']}-config.iso"
}
}
stage('Save changes reclass model') {
- sh(returnStatus: true, script: "tar -czf ${context['cluster_name']}.tar.gz --exclude='*@tmp' -C ${modelEnv} .")
- archiveArtifacts artifacts: "${context['cluster_name']}.tar.gz"
+ sh(returnStatus: true, script: "tar -czf output-${context['cluster_name']}/${context['cluster_name']}.tar.gz --exclude='*@tmp' -C ${modelEnv} .")
+ archiveArtifacts artifacts: "output-${context['cluster_name']}/${context['cluster_name']}.tar.gz"
if (RequesterEmail != '' && !RequesterEmail.contains('example')) {
emailext(to: RequesterEmail,
- attachmentsPattern: "*.${context['cluster_domain']}-config.iso",
+ attachmentsPattern: "output-${context['cluster_name']}/*",
body: "Mirantis Jenkins\n\nRequested reclass model ${context['cluster_name']} has been created and attached to this email.\nEnjoy!\n\nMirantis",
subject: "Your Salt model ${context['cluster_name']}")
}
+ dir("output-${context['cluster_name']}") {
+ deleteDir()
+ }
}
// Fail, but leave possibility to get failed artifacts