Updating master Jenkinsfiles in cord-6.0
Change-Id: I34789290682adb311bbd241c8d7d5bd71de74c7e
diff --git a/Jenkinsfile-rcordlite-zerotouch b/Jenkinsfile-rcordlite-zerotouch
index 8ab2528..2975f82 100644
--- a/Jenkinsfile-rcordlite-zerotouch
+++ b/Jenkinsfile-rcordlite-zerotouch
@@ -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-voltha -f ../${configBaseDir}/${configKubernetesDir}/${configFileName}.yml -f configs/onos-voltha.yaml onos
+ helm install -n onos-voltha -f configs/onos-voltha.yaml -f ../${configBaseDir}/${configKubernetesDir}/${configFileName}.yml onos
"""
}
timeout(10) {
@@ -128,7 +128,7 @@
timeout(10) {
sh returnStdout: true, script: """
export KUBECONFIG=$WORKSPACE/${configBaseDir}/${configKubernetesDir}/${configFileName}.conf
- helm install -n onos-fabric -f ../${configBaseDir}/${configKubernetesDir}/${configFileName}.yml -f configs/onos-fabric.yaml onos
+ helm install -n onos-fabric -f configs/onos-fabric.yaml -f ../${configBaseDir}/${configKubernetesDir}/${configFileName}.yml onos
"""
}
timeout(10) {