ci-scripts/Jenkinsfile

@@ -42,6 +42,12 @@ gitlabMergeRequestLink = ''
 // Docker Hub account to push to
 DH_Account = "oaisoftwarealliance"
 
+// Openshift project name
+Namespace = 'oaicicd-core'
+
+// Openshift server URL
+server = 'https://api.oai.cs.eurecom.fr:6443'
+
 // Private Local Registry URL
 PrivateRegistryURL = 'porcepix.sboai.cs.eurecom.fr'
 
@@ -179,11 +185,12 @@ pipeline {
                   withCredentials([
                     [$class: 'UsernamePasswordMultiBinding', credentialsId: "${rhelOcCredentials}", usernameVariable: 'OC_Username', passwordVariable: 'OC_Password']
                   ]) {
-                    sh "oc login -u ${OC_Username} -p ${OC_Password}"
+                    sh "oc login -u ${OC_Username} -p ${OC_Password} --server=${server}"
                   }
+                  sh "oc project ${Namespace}"
                   sh "oc delete istag oai-flexric:${flexric_tag} || true"
                   // Copy the RHEL Host certificates for building
-                  sh "./ci-scripts/common/python/recreate_entitlement.py"
+                  sh "./ci-scripts/common/python/recreate_entitlement.py -n ${Namespace}"
                   // Building
                   sh "oc delete -f openshift/build-config.yaml || true"
                   sh "sed -i -e 's@oai-flexric:latest@oai-flexric:${flexric_tag}@g' openshift/build-config.yaml"
@@ -192,7 +199,7 @@ pipeline {
                   // need python to wait for pod flexric-build-cfg-1-build to be Completed or Error
                   // it fails if it detects error or timeout at 20 minutes
                   sh "./ci-scripts/common/python/check_build_pod_status.py --pod-name flexric-build-cfg-1-build --log-file archives/flexric_rhel_image_build.log"
-                  sh "oc describe istag oai-flexric:${flexric_tag} | grep 'Image Size:' >> archives/flexric_rhel_image_build.log"
+                  sh "oc describe istag oai-flexric:${flexric_tag} -n ${Namespace} | grep 'Image Size:' >> archives/flexric_rhel_image_build.log"
                 }
               }
             }
@@ -206,7 +213,7 @@ pipeline {
             }
             cleanup {
               script {
-                sh "oc delete build flexric-build-cfg-1 || true"
+                sh "oc delete build flexric-build-cfg-1 -n ${Namespace} || true"
                 sh "oc logout || true"
                 stash allowEmpty: true, includes: 'archives/flexric_rhel_image_build.log', name: 'rhelBuildLog'
               }

common @ 382e158f

-Subproject commit 5615b671230361eb61b05e4872cc5bab616c0638
+Subproject commit 382e158f4ba0c40db45d271692ce3f6b6f3b5018

docker/Dockerfile.flexric.rhel

@@ -33,10 +33,6 @@ ENV TZ=Europe/Paris
 # Copy the entitlements
 COPY ./etc-pki-entitlement /etc/pki/entitlement
 
-# Copy the subscription manager configurations
-COPY ./rhsm-conf /etc/rhsm
-COPY ./rhsm-ca /etc/rhsm/ca
-
 #install developers pkg/repo
 RUN rm -f /etc/rhsm-host && \
     subscription-manager repos --enable codeready-builder-for-rhel-9-x86_64-rpms && \
@@ -68,8 +64,7 @@ RUN rm -f /etc/rhsm-host && \
     echo "/usr/local/lib" > /etc/ld.so.conf.d/local-lib.conf && \
     echo "/usr/local/lib64" >> /etc/ld.so.conf.d/local-lib.conf && \
     # Remove entitlements and Subscription Manager configs
-    rm -rf /etc/pki/entitlement && \
-    rm -rf /etc/rhsm
+    rm -rf /etc/pki/entitlement
 
 RUN git clone https://github.com/swig/swig.git && \
     cd swig && \
@@ -115,8 +110,7 @@ ENV TZ=Europe/Paris
 COPY ./etc-pki-entitlement /etc/pki/entitlement
 
 # Copy the subscription manager configurations
-COPY ./rhsm-conf /etc/rhsm
-COPY ./rhsm-ca /etc/rhsm/ca
+COPY --from=oai-flexric-base /etc/rhsm /etc/rhsm
 
 #install pkg/repo needed to run
 RUN  rm -f /etc/rhsm-host && \

openshift/build-config.yaml

@@ -30,13 +30,6 @@ spec:
           - secret:
               name: etc-pki-entitlement
             destinationDir: etc-pki-entitlement
-        configMaps:
-          - configMap:
-              name: rhsm-conf
-            destinationDir: rhsm-conf
-          - configMap:
-              name: rhsm-ca
-            destinationDir: rhsm-ca
     strategy:
         dockerStrategy:
             dockerfilePath: "docker/Dockerfile.flexric.rhel"