From d43bb44ada0070aee71f710c5f681529c833789c Mon Sep 17 00:00:00 2001 From: Mohammed Ismail <mohammed.ismail@openairinterface.org> Date: Thu, 9 Sep 2021 10:22:17 +0200 Subject: [PATCH] tag version updated on tutorials Signed-off-by: Mohammed Ismail <mohammed.ismail@openairinterface.org> --- docs/BUILD_IMAGES.md | 37 +++++++++++++++++++----------- docs/DEPLOY_SA5G_HC.md | 8 +++---- docs/DEPLOY_SA5G_WITH_DS_TESTER.md | 14 +++++------ docs/RETRIEVE_OFFICIAL_IMAGES.md | 26 ++++++++++++--------- 4 files changed, 50 insertions(+), 35 deletions(-) diff --git a/docs/BUILD_IMAGES.md b/docs/BUILD_IMAGES.md index a01d27e2..3f7151a4 100644 --- a/docs/BUILD_IMAGES.md +++ b/docs/BUILD_IMAGES.md @@ -34,18 +34,21 @@ We also recommend that you synchronize this "tutorial" repository with a provide | CNF Name | Branch Name | Tag | Ubuntu 18.04 | RHEL8 (UBI8) | | ----------- | ----------- | -------- | ------------ | ----------------| -| FED REPO | N/A | `v1.1.0` | | | -| AMF | `master` | `v1.1.0` | X | X | -| SMF | `master` | `v1.1.0` | X | X | -| NRF | `master` | `v1.1.0` | X | X | -| SPGW-U-TINY | `master` | `v1.1.2` | X | X | +| FED REPO | N/A | `v1.2.0` | | | +| AMF | `master` | `v1.2.0` | X | X | +| SMF | `master` | `v1.2.0` | X | X | +| NRF | `master` | `v1.2.0` | X | X | +| SPGW-U-TINY | `master` | `v1.2.0` | X | X | +| UDR | `master` | `v1.2.0` | X | X | +| UDM | `master` | `v1.2.0` | X | X | +| AUSF | `master` | `v1.2.0` | X | X | ```bash # Clone directly on the latest release tag -$ git clone --branch v1.1.0 https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-fed.git +$ git clone --branch v1.2.0 https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-fed.git $ cd oai-cn5g-fed # If you forgot to clone directly to the latest release tag -$ git checkout -f v1.1.0 +$ git checkout -f v1.2.0 # Synchronize all git submodules $ ./scripts/syncComponents.sh @@ -54,6 +57,9 @@ OAI-NRF component branch : master OAI-AMF component branch : master OAI-SMF component branch : master OAI-SPGW-U component branch : master +OAI-UDR component branch : master +OAI-UDM component branch : master +OAI-AUSF component branch : master --------------------------------------------------------- git submodule deinit --all --force git submodule init @@ -63,13 +69,18 @@ git submodule update or a little bit more dangerous ```bash -$ ./scripts/syncComponents.sh --nrf-branch v1.1.0 --amf-branch v1.1.0 \ - --smf-branch v1.1.0 --spgwu-tiny-branch v1.1.2 +$ ./scripts/syncComponents.sh --nrf-branch v1.2.0 --amf-branch v1.2.0 \ + --smf-branch v1.2.0 --spgwu-tiny-branch v1.2.0 \ + --udr-branch v1.2.0 --udm-branch v1.2.0 \ + --ausf-branch v1.2.0 --------------------------------------------------------- -OAI-NRF component branch : v1.1.0 -OAI-AMF component branch : v1.1.0 -OAI-SMF component branch : v1.1.0 -OAI-SPGW-U component branch : v1.1.2 +OAI-NRF component branch : v1.2.0 +OAI-AMF component branch : v1.2.0 +OAI-SMF component branch : v1.2.0 +OAI-SPGW-U component branch : v1.2.0 +OAI-UDR component branch : v1.2.0 +OAI-UDM component branch : v1.2.0 +OAI-AUSF component branch : v1.2.0 --------------------------------------------------------- git submodule deinit --all --force git submodule init diff --git a/docs/DEPLOY_SA5G_HC.md b/docs/DEPLOY_SA5G_HC.md index 0d611bb2..91edb111 100644 --- a/docs/DEPLOY_SA5G_HC.md +++ b/docs/DEPLOY_SA5G_HC.md @@ -56,7 +56,7 @@ Clone the helm chart repository from gitlab repository ``` $ git clone https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-fed.git -$ git checkout v1.1.0 #check the tag v1.1.0 +$ git checkout v1.2.0 #check the tag v1.2.0 $ cd charts $ ls charts mysql oai-amf oai-ausf oai-nrf oai-smf oai-spgwu-tiny oai-udm oai-udr @@ -127,7 +127,7 @@ namespace: "oai" nfimage: registry: local repository: rdefosseoai/oai-amf # image name either locally present or in a public/private repository - version: v1.1.0 # image tag + version: v1.2.0 # image tag # pullPolicy: IfNotPresent or Never or Always pullPolicy: Always @@ -186,7 +186,7 @@ namespace: "oai" # namespace where SMF will be deployed nfimage: registry: local repository: rdefosseoai/oai-smf - version: v1.1.0 + version: v1.2.0 #pullPolicy: IfNotPresent or Never or Always pullPolicy: Always @@ -252,7 +252,7 @@ namespace: "oai" nfimage: registry: local repository: rdefosseoai/oai-nrf - version: v1.1.0 + version: v1.2.0 # pullPolicy: IfNotPresent or Never or Always pullPolicy: Always diff --git a/docs/DEPLOY_SA5G_WITH_DS_TESTER.md b/docs/DEPLOY_SA5G_WITH_DS_TESTER.md index 755197c1..e4972c84 100644 --- a/docs/DEPLOY_SA5G_WITH_DS_TESTER.md +++ b/docs/DEPLOY_SA5G_WITH_DS_TESTER.md @@ -86,13 +86,13 @@ To know how to configure the machine with the above requirements vist [pre-requi | CNF Name | Branch Name | Tag | Ubuntu 18.04 | RHEL8 (UBI8) | | ----------- | ----------- | -------- | ------------ | ----------------| -| AMF | `master` | `v1.1.0` | X | X | -| SMF | `master` | `v1.1.0` | X | X | -| NRF | `master` | `v1.1.0` | X | X | -| SPGW-U-TINY | `master` | `v1.1.2` | X | X | -| UDR | `master` | `v1.1.0` | X | X | -| UDM | `master` | `v1.1.0` | X | X | -| AUSF | `master` | `v1.1.0` | X | X | +| AMF | `master` | `v1.2.0` | X | X | +| SMF | `master` | `v1.2.0` | X | X | +| NRF | `master` | `v1.2.0` | X | X | +| SPGW-U-TINY | `master` | `v1.2.0` | X | X | +| UDR | `master` | `v1.2.0` | X | X | +| UDM | `master` | `v1.2.0` | X | X | +| AUSF | `master` | `v1.2.0` | X | X | - In case readers are interested in making images using different branch then **they have to build images from scratch they can't use the docker-hub images**. diff --git a/docs/RETRIEVE_OFFICIAL_IMAGES.md b/docs/RETRIEVE_OFFICIAL_IMAGES.md index bc799d23..a803a9ea 100644 --- a/docs/RETRIEVE_OFFICIAL_IMAGES.md +++ b/docs/RETRIEVE_OFFICIAL_IMAGES.md @@ -33,6 +33,10 @@ Username: Password: ``` +The OAI CI/CD team has automated more frequent pushes to Docker-Hub on `rdefosseoai` account. Two important things to be noted: + - We will keep pushing to the `latest` tag when a milestone is reached. + - We are making pushes on the `develop` tag whenever a contribution has been accepted. These images are **EXPERIMENTAL**. + Now pull images. ```bash @@ -71,25 +75,25 @@ We will push new versions when new features are validated. This repository only has tutorials and Continuous Integration scripts. -**At the time of writing (2021/07/22), the release tag is `v1.1.0`.** +**At the time of writing (2021/09/09), the release tag is `v1.2.0`.** | CNF Name | Branch Name | Tag | Ubuntu 18.04 | RHEL8 (UBI8) | | ----------- | ----------- | -------- | ------------ | ----------------| -| FED REPO | N/A | `v1.1.0` | | | -| AMF | `master` | `v1.1.0` | X | X | -| SMF | `master` | `v1.1.0` | X | X | -| NRF | `master` | `v1.1.0` | X | X | -| SPGW-U-TINY | `master` | `v1.1.2` | X | X | -| UDR | `master` | `v1.1.0` | X | X | -| UDM | `master` | `v1.1.0` | X | X | -| AUSF | `master` | `v1.1.0` | X | X | +| FED REPO | N/A | `v1.2.0` | | | +| AMF | `master` | `v1.2.0` | X | X | +| SMF | `master` | `v1.2.0` | X | X | +| NRF | `master` | `v1.2.0` | X | X | +| SPGW-U-TINY | `master` | `v1.2.0` | X | X | +| UDR | `master` | `v1.2.0` | X | X | +| UDM | `master` | `v1.2.0` | X | X | +| AUSF | `master` | `v1.2.0` | X | X | ```bash # Clone directly on the latest release tag -$ git clone --branch v1.1.0 https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-fed.git +$ git clone --branch v1.2.0 https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-fed.git $ cd oai-cn5g-fed # If you forgot to clone directly to the latest release tag -$ git checkout -f v1.1.0 +$ git checkout -f v1.2.0 # Synchronize all git submodules $ ./scripts/syncComponents.sh -- GitLab