Default to Charmed Install

OpenEBS is giving us troubles again, so we need to use the --charmed option
in the installer until we can figure out how to fix the K8s installer.

Change-Id: I6dcd24f9b7c1f70d074bcd40f63fb110fb1c355b
Signed-off-by: beierlm <mark.beierl@canonical.com>
(cherry picked from commit 205920ea8c6d155c25b380b76d7f1bc1f7af71ba)

diff --git a/jenkins/ci-pipelines/ci_stage_1.groovy b/jenkins/ci-pipelines/ci_stage_1.groovy
index 0f530c5..598d982 100644 (file)
--- a/jenkins/ci-pipelines/ci_stage_1.groovy
+++ b/jenkins/ci-pipelines/ci_stage_1.groovy
@@ -72,6 +72,7 @@ node("${params.NODE}") {
             string(name: 'GERRIT_PROJECT', value: GERRIT_PROJECT),
             string(name: 'GERRIT_REFSPEC', value: GERRIT_REFSPEC),
             string(name: 'GERRIT_PATCHSET_REVISION', value: GERRIT_PATCHSET_REVISION),
+            string(name: 'INSTALLER', value: params.INSTALLER),
             string(name: 'PROJECT_URL_PREFIX', value: params.PROJECT_URL_PREFIX),
             string(name: 'DOCKER_TAG', value: params.DOCKER_TAG),
             booleanParam(name: 'TEST_INSTALL', value: params.TEST_INSTALL),
@@ -93,7 +94,8 @@ node("${params.NODE}") {
         // callout to stage_2.  This is a multi-branch pipeline.
         downstream_job_name = "${mdg}-${stage_name}/${GERRIT_BRANCH}"
 
-        println("TEST_INSTALL = ${params.TEST_INSTALL}, downstream job: ${downstream_job_name}")
+        println("Downstream job: ${downstream_job_name}")
+        println("Downstream parameters: ${downstream_params}")
                currentBuild.result = 'SUCCESS'
         try {
             stage_3_merge_result = build job: "${downstream_job_name}", parameters: downstream_params, propagate: true

diff --git a/jenkins/ci-pipelines/ci_stage_2.groovy b/jenkins/ci-pipelines/ci_stage_2.groovy
index 379ecbd..f211978 100644 (file)
--- a/jenkins/ci-pipelines/ci_stage_2.groovy
+++ b/jenkins/ci-pipelines/ci_stage_2.groovy
@@ -115,6 +115,7 @@ def ci_pipeline(mdg,url_prefix,project,branch,refspec,revision,do_stage_3,artifa
         stage('Build System') {
             def downstream_params_stage_3 = [
                 string(name: 'GERRIT_BRANCH', value: "${branch}"),
+                string(name: 'INSTALLER', value: "charmed" ),
                 string(name: 'UPSTREAM_JOB_NAME', value: "${JOB_NAME}" ),
                 string(name: 'UPSTREAM_JOB_NUMBER', value: "${BUILD_NUMBER}" ),
                 booleanParam(name: 'DO_STAGE_4', value: do_stage_4 )