Merge pull request #732 from application-stacks/ebc-sps

Changes to allow ZP builds on SPS

Author: idlewis

ebcDockerBuilderRCO.jenkinsfile

@@ -12,6 +12,7 @@ properties([
       string(name: 'PIPELINE_OPERATOR_IMAGE', defaultValue: "cp/runtime-component-operator", description: 'namespace to push image to in registry'),
       string(name: 'RELEASE_TARGET', defaultValue: "main", description: 'release branch to use'),
       string(name: 'PIPELINE_PRODUCTION_IMAGE', defaultValue: "icr.io/cpopen/runtime-component-operator", description: 'namespace in prod registry'),
+      string(name: 'PIPELINE_TYPE', defaultValue: "1pipeline", description: 'Type of pipeline running'),
       string(name: 'REDHAT_BASE_IMAGE', defaultValue: "registry.redhat.io/openshift4/ose-operator-registry", description: 'base image for operator'),
       string(name: 'REDHAT_REGISTRY', defaultValue: "registry.redhat.io", description: 'RH registry used for docker login'),
       string(name: 'PIPELINE_REGISTRY', defaultValue: "cp.stg.icr.io", description: 'staging registry to push images to'),
@@ -82,19 +83,29 @@ timestamps {
 
 // Clone the git repo and stash it, so that the jenkins agent machine can grab it later
 def gitCloneAndStash() {
-  dir('runtime-component-operator') {
-      git branch: "main", url: "[email protected]:${scriptOrg}/runtime-component-operator.git"
-      sh "git checkout ${RELEASE_TARGET}"
-  }
-  dir('operators') {
-      git branch: "main", url: "[email protected]:websphere/operators.git"
-      sh "git checkout ${COMMON_OPERATORS_BRANCH}"
-  }
-  sh "cp -rf operators runtime-component-operator/"
-  dir('runtime-component-operator') {
-      stash(name: 'runtime-component-operator')
-   }
-   sh "ls -l"
+    dir('runtime-component-operator') {
+        git branch: "main", url: "[email protected]:${scriptOrg}/runtime-component-operator.git"
+        sh "git checkout ${RELEASE_TARGET}"
+    }
+    if (params.PIPELINE_TYPE == "SPS") {
+        dir('runtime-component-operator-sps-config') {
+            git branch: "main", url: "[email protected]:websphere-operators-sps/websphere-liberty-operator-sps-config.git"
+            sh "git checkout ${COMMON_OPERATORS_BRANCH}"
+        }
+        sh "mkdir runtime-component-operator/operators"
+        sh "cp -rf websphere-liberty-operator-sps-config/scripts runtime-component-operator/operators/scripts"
+    }
+    else {
+        dir('operators') {
+            git branch: "main", url: "[email protected]:websphere/operators.git"
+            sh "git checkout ${COMMON_OPERATORS_BRANCH}"
+        }
+        sh "cp -rf operators runtime-component-operator/"
+    }
+    dir('runtime-component-operator') {
+        stash(name: 'runtime-component-operator')
+    }
+    sh "ls -l"
 }
 
 // Job Specific Functions
@@ -141,4 +152,4 @@ def void ebcCleanup(){
          sh "./ebc_complete.sh"
       }
    }
-}
+}