diff --git a/docker/Dockerfile.eNB.rhel7.oc4-4 b/docker/Dockerfile.eNB.rhel7.oc4-4
index 6dbf4f1749d07a55c4c166b71eb41183289aea44..85c2a17ead65dc4326f559e8f45d42868619e770 100644
--- a/docker/Dockerfile.eNB.rhel7.oc4-4
+++ b/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
diff --git a/docker/Dockerfile.eNB.rhel8.2.oc4-4 b/docker/Dockerfile.eNB.rhel8.2.oc4-4
index d62ed59ad6517a48a4539442cf1f388727225043..b3d9b68af8fbf9bfa9e300121d10c8c2fbbbc1e0 100644
--- a/docker/Dockerfile.eNB.rhel8.2.oc4-4
+++ b/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
diff --git a/docker/Dockerfile.gNB.rhel7.oc4-4 b/docker/Dockerfile.gNB.rhel7.oc4-4
index 42d6a8e73112374d21983dff081309cd0e2f7139..5165dd971595ce7d2d8ccfe602dcad0df9689136 100644
--- a/docker/Dockerfile.gNB.rhel7.oc4-4
+++ b/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
diff --git a/docker/Dockerfile.gNB.rhel8.2.oc4-4 b/docker/Dockerfile.gNB.rhel8.2.oc4-4
index 1a7af914cb362a1a565be1a889081c5eea9cf358..94d8ca2ea8a8f72d68a4457d5724856e65b59a53 100644
--- a/docker/Dockerfile.gNB.rhel8.2.oc4-4
+++ b/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
diff --git a/docker/Dockerfile.lteUE.rhel8.2.oc4-4 b/docker/Dockerfile.lteUE.rhel8.2.oc4-4
index 2cb2448ec20b36e425383e546005c511fd69b51e..431c8caa7fd31877d63a0572fdca37a6a53c27cb 100644
--- a/docker/Dockerfile.lteUE.rhel8.2.oc4-4
+++ b/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
diff --git a/docker/Dockerfile.nrUE.rhel8.2.oc4-4 b/docker/Dockerfile.nrUE.rhel8.2.oc4-4
index df8ee90fed968368a7e2045818501bb9493ac28b..0787cb481e29bdf7db7f5764ec293758f1bc509e 100644
--- a/docker/Dockerfile.nrUE.rhel8.2.oc4-4
+++ b/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
diff --git a/openshift/oai-enb-build-config.yml b/openshift/oai-enb-build-config.yml
index 855710cd879da681ba8287a51829bdc24e53edc6..3f6875c50d1d53269f34ce7fd6fd5aa5b50a3e90 100644
--- a/openshift/oai-enb-build-config.yml
+++ b/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"
diff --git a/openshift/oai-enb-image-stream.yml b/openshift/oai-enb-image-stream.yml
index 7bee038f8379792891f8e98a39efbc9ca1909bea..94ee13e50f32a5fc012d3a7eff58ce750a30e358 100644
--- a/openshift/oai-enb-image-stream.yml
+++ b/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
diff --git a/openshift/oai-enb-rh8-build-config.yml b/openshift/oai-enb-rh8-build-config.yml
index 7c03cce16110a7359a449877a8e6f40681a8f638..e715fc5733c669b31fdb3edc65fba019c18ea1f6 100644
--- a/openshift/oai-enb-rh8-build-config.yml
+++ b/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"
diff --git a/openshift/oai-enb-rh8-image-stream.yml b/openshift/oai-enb-rh8-image-stream.yml
index fe8dabe75629cfe6335976042b64a5c7ff85a8f9..9d1cfebd54b000d7e2493312769a8ebe26f33d11 100644
--- a/openshift/oai-enb-rh8-image-stream.yml
+++ b/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
diff --git a/openshift/oai-gnb-build-config.yml b/openshift/oai-gnb-build-config.yml
index c720261aeea205b543c0609a7a81fad82c9c6b05..b0c99959d1d71ea7273f66345bb7ba9da1148bd4 100644
--- a/openshift/oai-gnb-build-config.yml
+++ b/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"
diff --git a/openshift/oai-gnb-image-stream.yml b/openshift/oai-gnb-image-stream.yml
index 4be858a10ea184169945a05911b1341d48dec07f..22a6c157d2d7523dbd9ec4deed139e30fffb0760 100644
--- a/openshift/oai-gnb-image-stream.yml
+++ b/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
diff --git a/openshift/oai-gnb-rh8-build-config.yml b/openshift/oai-gnb-rh8-build-config.yml
index 4ca9073f0bdf266db6c4c4e468756414d1fa2614..aa3553c1e4933fda239024afdb1cc6bd992b8957 100644
--- a/openshift/oai-gnb-rh8-build-config.yml
+++ b/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"
diff --git a/openshift/oai-gnb-rh8-image-stream.yml b/openshift/oai-gnb-rh8-image-stream.yml
index 8b98d980efa88bd0846d5dba94aa5192c08c8426..2e04e94f5b237c9ab42d442b7390dec481463395 100644
--- a/openshift/oai-gnb-rh8-image-stream.yml
+++ b/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
diff --git a/openshift/oai-lte-ue-rh8-build-config.yml b/openshift/oai-lte-ue-rh8-build-config.yml
index 6469eff0b7dd7b08f68a2c65eca539df44358c22..f077e4cb26a23a2927ed57f4b1f4697c67c1d155 100644
--- a/openshift/oai-lte-ue-rh8-build-config.yml
+++ b/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"
diff --git a/openshift/oai-lte-ue-rh8-image-stream.yml b/openshift/oai-lte-ue-rh8-image-stream.yml
index da58ad5a0fbc9003b58d8dc3c0f34390a3129ca9..09aeb2a7660bed189e20d02c64d372a6832d6e83 100644
--- a/openshift/oai-lte-ue-rh8-image-stream.yml
+++ b/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
diff --git a/openshift/oai-nr-ue-rh8-build-config.yml b/openshift/oai-nr-ue-rh8-build-config.yml
index 4fc91d9d3bff8dcae2d5f25817b47182702f19df..b3367f6ab60922381fc9a3665a27445cea8394cd 100644
--- a/openshift/oai-nr-ue-rh8-build-config.yml
+++ b/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"
diff --git a/openshift/oai-nr-ue-rh8-image-stream.yml b/openshift/oai-nr-ue-rh8-image-stream.yml
index cb456c9cc9e5217a8375027128afaca125351a29..e61cc0dfde9763b0f077eb5b83ebc76a4139ce66 100644
--- a/openshift/oai-nr-ue-rh8-image-stream.yml
+++ b/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
diff --git a/openshift/oai-ran-build-config.yml b/openshift/oai-ran-build-config.yml
index 94097f139667266c471e1f50d653430c9376be38..39d7a40f6def408c40e0b12f51c121e30ab33048 100644
--- a/openshift/oai-ran-build-config.yml
+++ b/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"
diff --git a/openshift/oai-ran-image-stream.yml b/openshift/oai-ran-image-stream.yml
index df5cb70a5c8d785044ae1368dadcf45b09a2f006..e1ef9d0b31f7a2006aa13ad363a3c417284f671c 100644
--- a/openshift/oai-ran-image-stream.yml
+++ b/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
diff --git a/openshift/oai-ran-rh8-build-config.yml b/openshift/oai-ran-rh8-build-config.yml
index ab5c73b11ad99fb8998285f7f89b0a62505849e2..3d27b7cb5cd69ab495b915fe5e68dfb56e7cef5a 100644
--- a/openshift/oai-ran-rh8-build-config.yml
+++ b/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"
diff --git a/openshift/oai-ran-rh8-image-stream.yml b/openshift/oai-ran-rh8-image-stream.yml
index 5b8b397aaa85b9e0d8e3937372fc001ca1897f0f..f6f4f8614fb9dd5f8db01a4a4a813bd04e882d32 100644
--- a/openshift/oai-ran-rh8-image-stream.yml
+++ b/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