[OC]: point to proper namespace and branch

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

docker/Dockerfile.eNB.rhel7.oc4-4

@@ -25,7 +25,7 @@
 #
 #---------------------------------------------------------------------
 
-FROM image-registry.openshift-image-registry.svc:5000/oaicicd-ran-tmp/oai-ran:ci-ran-tmp AS enb-build 
+FROM image-registry.openshift-image-registry.svc:5000/oai/oai-ran:latest AS enb-build 
 
 
 WORKDIR /oai-enb

docker/Dockerfile.eNB.rhel8.2.oc4-4

@@ -25,7 +25,7 @@
 #
 #---------------------------------------------------------------------
 
-FROM image-registry.openshift-image-registry.svc:5000/oaicicd-ran-tmp/oai-ran:tmp-rhel8-latest AS enb-build 
+FROM image-registry.openshift-image-registry.svc:5000/oai/oai-ran:rhel8-latest AS enb-build 
 
 
 WORKDIR /oai-ran

docker/Dockerfile.gNB.rhel7.oc4-4

@@ -25,7 +25,7 @@
 #
 #---------------------------------------------------------------------
 
-FROM image-registry.openshift-image-registry.svc:5000/oaicicd-ran-tmp/oai-ran:ci-ran-tmp AS gnb-build 
+FROM image-registry.openshift-image-registry.svc:5000/oai/oai-ran:latest AS gnb-build 
 
 
 WORKDIR /oai-gnb

docker/Dockerfile.gNB.rhel8.2.oc4-4

@@ -25,7 +25,7 @@
 #
 #---------------------------------------------------------------------
 
-FROM image-registry.openshift-image-registry.svc:5000/oaicicd-ran-tmp/oai-ran:tmp-rhel8-latest AS gnb-build 
+FROM image-registry.openshift-image-registry.svc:5000/oai/oai-ran:rhel8-latest AS gnb-build 
 
 
 WORKDIR /oai-ran

docker/Dockerfile.lteUE.rhel8.2.oc4-4

@@ -25,7 +25,7 @@
 #
 #---------------------------------------------------------------------
 
-FROM image-registry.openshift-image-registry.svc:5000/oaicicd-ran-tmp/oai-ran:tmp-rhel8-latest AS lte-ue-build 
+FROM image-registry.openshift-image-registry.svc:5000/oai/oai-ran:rhel8-latest AS lte-ue-build 
 
 
 WORKDIR /oai-ran

docker/Dockerfile.nrUE.rhel8.2.oc4-4

@@ -25,7 +25,7 @@
 #
 #---------------------------------------------------------------------
 
-FROM image-registry.openshift-image-registry.svc:5000/oaicicd-ran-tmp/oai-ran:tmp-rhel8-latest AS nr-ue-build 
+FROM image-registry.openshift-image-registry.svc:5000/oai/oai-ran:rhel8-latest AS nr-ue-build 
 
 
 WORKDIR /oai-ran

openshift/oai-enb-build-config.yml

@@ -30,7 +30,7 @@ spec:
         #still needed for the target image
         git:
             uri: "https://gitlab.eurecom.fr/oai/openairinterface5g.git"
-            ref: "rh_ci_oc"
+            ref: "develop"
             httpProxy: http://proxy.eurecom.fr:8080
             httpsProxy: https://proxy.eurecom.fr:8080
         secrets:
@@ -52,4 +52,4 @@ spec:
     output:
         to:
             kind: "ImageStreamTag"
-            name: "oai-enb:ci-ran-tmp"
+            name: "oai-enb:latest"

openshift/oai-enb-image-stream.yml

@@ -24,7 +24,7 @@ apiVersion: v1
 kind: ImageStream
 metadata:
     name: oai-enb
-    namespace: oaicicd-ran-tmp
+    namespace: oai
 status:
-    tag: ci-ran-tmp
+    tag: latest
 

openshift/oai-enb-rh8-build-config.yml

@@ -30,7 +30,7 @@ spec:
         #still needed for the target image
         git:
             uri: "https://gitlab.eurecom.fr/oai/openairinterface5g.git"
-            ref: "rh_ci_oc"
+            ref: "develop"
             httpProxy: http://proxy.eurecom.fr:8080
             httpsProxy: https://proxy.eurecom.fr:8080
     strategy:
@@ -45,4 +45,4 @@ spec:
     output:
         to:
             kind: "ImageStreamTag"
-            name: "oai-enb:tmp-rhel8-latest"
+            name: "oai-enb:rhel8-latest"

openshift/oai-enb-rh8-image-stream.yml

@@ -24,7 +24,7 @@ apiVersion: v1
 kind: ImageStream
 metadata:
     name: oai-enb
-    namespace: oaicicd-ran-tmp
+    namespace: oai
 status:
-    tag: tmp-rhel8-latest
+    tag: rhel8-latest
 

openshift/oai-gnb-build-config.yml

@@ -30,7 +30,7 @@ spec:
         #still needed for the target image
         git:
             uri: "https://gitlab.eurecom.fr/oai/openairinterface5g.git"
-            ref: "rh_ci_oc"
+            ref: "develop"
             httpProxy: http://proxy.eurecom.fr:8080
             httpsProxy: https://proxy.eurecom.fr:8080
         secrets:
@@ -52,4 +52,4 @@ spec:
     output:
         to:
             kind: "ImageStreamTag"
-            name: "oai-gnb:ci-ran-tmp"
+            name: "oai-gnb:latest"

openshift/oai-gnb-image-stream.yml

@@ -24,7 +24,7 @@ apiVersion: v1
 kind: ImageStream
 metadata:
     name: oai-gnb
-    namespace: oaicicd-ran-tmp
+    namespace: oai
 status:
-    tag: ci-ran-tmp
+    tag: latest
 

openshift/oai-gnb-rh8-build-config.yml

@@ -30,7 +30,7 @@ spec:
         #still needed for the target image
         git:
             uri: "https://gitlab.eurecom.fr/oai/openairinterface5g.git"
-            ref: "rh_ci_oc"
+            ref: "develop"
             httpProxy: http://proxy.eurecom.fr:8080
             httpsProxy: https://proxy.eurecom.fr:8080
     strategy:
@@ -45,4 +45,4 @@ spec:
     output:
         to:
             kind: "ImageStreamTag"
-            name: "oai-gnb:tmp-rhel8-latest"
+            name: "oai-gnb:rhel8-latest"

openshift/oai-gnb-rh8-image-stream.yml

@@ -24,7 +24,7 @@ apiVersion: v1
 kind: ImageStream
 metadata:
     name: oai-gnb
-    namespace: oaicicd-ran-tmp
+    namespace: oai
 status:
-    tag: tmp-rhel8-latest
+    tag: rhel8-latest
 

openshift/oai-lte-ue-rh8-build-config.yml

@@ -30,7 +30,7 @@ spec:
         #still needed for the target image
         git:
             uri: "https://gitlab.eurecom.fr/oai/openairinterface5g.git"
-            ref: "rh_ci_oc"
+            ref: "develop"
             httpProxy: http://proxy.eurecom.fr:8080
             httpsProxy: https://proxy.eurecom.fr:8080
     strategy:
@@ -45,4 +45,4 @@ spec:
     output:
         to:
             kind: "ImageStreamTag"
-            name: "oai-lte-ue:tmp-rhel8-latest"
+            name: "oai-lte-ue:rhel8-latest"

openshift/oai-lte-ue-rh8-image-stream.yml

@@ -24,7 +24,7 @@ apiVersion: v1
 kind: ImageStream
 metadata:
     name: oai-lte-ue
-    namespace: oaicicd-ran-tmp
+    namespace: oai
 status:
-    tag: tmp-rhel8-latest
+    tag: rhel8-latest
 

openshift/oai-nr-ue-rh8-build-config.yml

@@ -30,7 +30,7 @@ spec:
         #still needed for the target image
         git:
             uri: "https://gitlab.eurecom.fr/oai/openairinterface5g.git"
-            ref: "rh_ci_oc"
+            ref: "develop"
             httpProxy: http://proxy.eurecom.fr:8080
             httpsProxy: https://proxy.eurecom.fr:8080
     strategy:
@@ -45,4 +45,4 @@ spec:
     output:
         to:
             kind: "ImageStreamTag"
-            name: "oai-nr-ue:tmp-rhel8-latest"
+            name: "oai-nr-ue:rhel8-latest"

openshift/oai-nr-ue-rh8-image-stream.yml

@@ -24,7 +24,7 @@ apiVersion: v1
 kind: ImageStream
 metadata:
     name: oai-nr-ue
-    namespace: oaicicd-ran-tmp
+    namespace: oai
 status:
-    tag: tmp-rhel8-latest
+    tag: rhel8-latest
 

openshift/oai-ran-build-config.yml

@@ -29,7 +29,7 @@ spec:
     source:
         git:
             uri: "https://gitlab.eurecom.fr/oai/openairinterface5g.git"
-            ref: "rh_ci_oc"
+            ref: "develop"
             httpProxy: http://proxy.eurecom.fr:8080
             httpsProxy: https://proxy.eurecom.fr:8080
         secrets:
@@ -49,4 +49,4 @@ spec:
     output:
         to:
             kind: "ImageStreamTag"
-            name: "oai-ran:ci-ran-tmp"
+            name: "oai-ran:latest"

openshift/oai-ran-image-stream.yml

@@ -24,7 +24,7 @@ apiVersion: v1
 kind: ImageStream
 metadata:
     name: oai-ran
-    namespace: oaicicd-ran-tmp
+    namespace: oai
 status:
-    tag: ci-ran-tmp
+    tag: latest
 

openshift/oai-ran-rh8-build-config.yml

@@ -29,7 +29,7 @@ spec:
     source:
         git:
             uri: "https://gitlab.eurecom.fr/oai/openairinterface5g.git"
-            ref: "rh_ci_oc"
+            ref: "develop"
             httpProxy: http://proxy.eurecom.fr:8080
             httpsProxy: https://proxy.eurecom.fr:8080
         secrets:
@@ -54,4 +54,4 @@ spec:
     output:
         to:
             kind: "ImageStreamTag"
-            name: "oai-ran:tmp-rhel8-latest"
+            name: "oai-ran:rhel8-latest"

openshift/oai-ran-rh8-image-stream.yml

@@ -24,7 +24,7 @@ apiVersion: v1
 kind: ImageStream
 metadata:
     name: oai-ran
-    namespace: oaicicd-ran-tmp
+    namespace: oai
 status:
-    tag: tmp-rhel8-latest
+    tag: rhel8-latest