Updating master Jenkinsfiles
Change-Id: I8d7e6692b8a6bf8aec4ba22e8f49aa054b9ad49f
diff --git a/Jenkinsfile-attworkflow b/Jenkinsfile-attworkflow
index d40026b..5731fcb 100644
--- a/Jenkinsfile-attworkflow
+++ b/Jenkinsfile-attworkflow
@@ -26,7 +26,7 @@
rm -rf helm-charts cord-tester
git clone -b ${branch} ${cordRepoUrl}/helm-charts
export KUBECONFIG=$WORKSPACE/${configBaseDir}/${configKubernetesDir}/${configFileName}.conf
- for hchart in \$(helm list -q);
+ for hchart in \$(helm list -q | grep -E -v 'docker-registry|mavenrepo|ponnet');
do
echo "Purging chart: \${hchart}"
helm delete --purge "\${hchart}"
@@ -111,7 +111,7 @@
timeout(10) {
sh returnStdout: true, script: """
export KUBECONFIG=$WORKSPACE/${configBaseDir}/${configKubernetesDir}/${configFileName}.conf
- helm install -n onos -f ../${configBaseDir}/${configKubernetesDir}/${configFileName}.yml -f configs/onos.yaml onos
+ helm install -n onos -f configs/onos.yaml -f ../${configBaseDir}/${configKubernetesDir}/${configFileName}.yml onos
"""
}
timeout(10) {