KOGITO-9681 CI: Use cloud shared libraries

apache · Aug 7, 2023 · 022a054 · 022a054
1 parent 2775085
commit 022a054
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 157 deletions.
diff --git a/.ci/jenkins/Jenkinsfile.build-image b/.ci/jenkins/Jenkinsfile.build-image
@@ -21,10 +21,6 @@ pipeline {
         CONTAINER_ENGINE = 'docker'
         CONTAINER_ENGINE_TLS_OPTIONS = ''
 
-        OPENSHIFT_API = credentials('OPENSHIFT_API')
-        OPENSHIFT_REGISTRY = credentials('OPENSHIFT_REGISTRY')
-        OPENSHIFT_CREDS_KEY = 'OPENSHIFT_CREDS'
-
         IMAGE_BUILD_PLATFORMS = 'linux/amd64,linux/arm64'
     }
     stages {
@@ -55,13 +51,8 @@ pipeline {
                     }
 
                     // Login to final registry if deploy is needed
-                    if (shouldDeployImage()) {
-                        if (isDeployImageInOpenshiftRegistry()) {
-                            cloud.loginOpenShift(env.OPENSHIFT_API, env.OPENSHIFT_CREDS_KEY)
-                            cloud.loginOpenshiftRegistry(env.CONTAINER_ENGINE, env.CONTAINER_ENGINE_TLS_OPTIONS ?: '')
-                        } else if (getDeployImageRegistryCredentials()) {
-                            cloud.loginContainerRegistry(getDeployImageRegistry(), getDeployImageRegistryCredentials(), env.CONTAINER_ENGINE, env.CONTAINER_ENGINE_TLS_OPTIONS ?: '')
-                        }
+                    if (shouldDeployImage() && getDeployImageRegistryCredentials()) {
+                        getContainerEngineService().loginContainerRegistry(getDeployImageRegistry(), getDeployImageRegistryCredentials())
                     }
                 }
             }
@@ -107,7 +98,7 @@ pipeline {
                 script {
                     updateGithubCommitStatus('PENDING', 'Build in progress')
 
-                    String localRegistry = cloud.startLocalRegistry()
+                    String localRegistry = getContainerEngineService().startLocalRegistry()
                     cloud.prepareForDockerMultiplatformBuild([localRegistry],[cloud.getDockerIOMirrorRegistryConfig()], false)
 
                     // Generate the Dockerfile
@@ -214,11 +205,16 @@ pipeline {
     }
 }
 
+ContainerEngineService getContainerEngineService() {
+    return new ContainerEngineService(this)
+}
+
 void clean() {
-    util.cleanNode(env.CONTAINER_ENGINE)
+    util.cleanNode()
+    getContainerEngineService().clean()
+    getContainerEngineService().cleanLocalRegistry()
 
     cloud.cleanDockerMultiplatformBuild()
-    cloud.cleanLocalRegistry()
     cloud.cleanSkopeo()
 
     // Clean Cekit cache, in case we reuse an old node
@@ -260,20 +256,16 @@ void runPythonCommand(String cmd, boolean stdout = false) {
 // Deploy image information
 ////////////////////////////////////////////////////////////////////////
 
-boolean isDeployImageInOpenshiftRegistry() {
-    return params.DEPLOY_IMAGE_USE_OPENSHIFT_REGISTRY
-}
-
 String getDeployImageRegistryCredentials() {
     return params.DEPLOY_IMAGE_REGISTRY_CREDENTIALS
 }
 
 String getDeployImageRegistry() {
-    return isDeployImageInOpenshiftRegistry() ? env.OPENSHIFT_REGISTRY : params.DEPLOY_IMAGE_REGISTRY
+    return params.DEPLOY_IMAGE_REGISTRY
 }
 
 String getDeployImageNamespace() {
-    return isDeployImageInOpenshiftRegistry() ? 'openshift' : params.DEPLOY_IMAGE_NAMESPACE
+    return params.DEPLOY_IMAGE_NAMESPACE
 }
 
 String getDeployImageNameSuffix() {

diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
@@ -27,8 +27,6 @@ pipeline {
         KOGITO_CI_EMAIL_TO = credentials("${JENKINS_EMAIL_CREDS_ID}")
 
         PR_BRANCH_HASH = "${util.generateHash(10)}"
-
-        OPENSHIFT_REGISTRY = credentials('OPENSHIFT_REGISTRY')
     }
 
     stages {
@@ -282,7 +280,6 @@ void createBuildAndTestStageClosure(String image) {
             buildParams.add(string(name: 'TESTS_KOGITO_EXAMPLES_REF', value: params.EXAMPLES_REF))
 
             buildParams.add(booleanParam(name: 'DEPLOY_IMAGE', value: true))
-            buildParams.add(booleanParam(name: 'DEPLOY_IMAGE_USE_OPENSHIFT_REGISTRY', value: isDeployImageInOpenshiftRegistry()))
             buildParams.add(string(name: 'DEPLOY_IMAGE_REGISTRY_CREDENTIALS', value: getDeployImageRegistryCredentials()))
             buildParams.add(string(name: 'DEPLOY_IMAGE_REGISTRY', value: getDeployImageRegistry()))
             buildParams.add(string(name: 'DEPLOY_IMAGE_NAMESPACE', value: getDeployImageNamespace()))
@@ -341,19 +338,16 @@ List getTestFailedImages() {
 // Deploy image information
 ////////////////////////////////////////////////////////////////////////
 
-boolean isDeployImageInOpenshiftRegistry() {
-    return params.IMAGE_USE_OPENSHIFT_REGISTRY
-}
 
 String getDeployImageRegistryCredentials() {
     return params.IMAGE_REGISTRY_CREDENTIALS
 }
 
 String getDeployImageRegistry() {
-    return isDeployImageInOpenshiftRegistry() ? env.OPENSHIFT_REGISTRY : params.IMAGE_REGISTRY
+    return params.IMAGE_REGISTRY
 }
 String getDeployImageNamespace() {
-    return isDeployImageInOpenshiftRegistry() ? 'openshift' : params.IMAGE_NAMESPACE
+    return params.IMAGE_NAMESPACE
 }
 String getDeployImageNameSuffix() {
     return params.IMAGE_NAME_SUFFIX