Adding OAI RAN and UE test deployment scripts #227

josephthaliath · 2023-12-18T18:01:21Z

What type of PR is this?

Uncomment only one /kind <> line, hit enter to put that in a new line, and remove leading whitespaces from that line:

/kind bug
/kind cleanup
/kind design
/kind documentation
/kind failing-test

kind feature

/kind flake

What this PR does / why we need it:

This PR is adding new test scripts for deploying OAI RAN and core NFs

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

New test scripts are included for deploying OAI RAN and core NFs using Nephio

nephio-prow · 2023-12-18T18:01:32Z

Hi @josephthaliath. Thanks for your PR.

I'm waiting for a nephio-project member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

johnbelamaric · 2023-12-18T18:05:56Z

/ok-to-test

I also fixed it so that won't be needed anymore (gave the sig-automation team Triage access on this repo)

electrocucaracha

@josephthaliath I made few suggestions on these files, don't forget to add information into the description of the PR

electrocucaracha · 2023-12-18T18:08:36Z

e2e/tests/oai/002.sh

@@ -27,18 +27,26 @@ source "${LIBDIR}/k8s.sh"
 # shellcheck source=e2e/lib/kpt.sh
 source "${LIBDIR}/kpt.sh"

+#adding directory path to register repository to have upstream packages in repository subdirectory when used with packagevariantset
+#TODO: to change the private catalog repository to nephio catalog repository after PR approval
+kpt alpha repo register --namespace default https://github.com/josephthaliath/catalog.git --directory=workloads/oai --name=oai-ran-packages


@josephthaliath are you using this PR for these tests?

electrocucaracha · 2023-12-18T18:10:48Z

e2e/tests/oai/002-oai-operators.yaml

+      kind: WorkloadCluster
+    template:
+      annotations:
+        approval.nephio.org/policy: initial


It seems like you have a line ending at in the file, maybe it's added by your text editor

electrocucaracha · 2023-12-18T18:12:11Z

e2e/tests/oai/002-oai-operators.yaml

+  upstream:
+    repo: oai-ran-packages
+    package: oai-ran-operator
+    revision: v1


Are you sure that this is the right revision?

Suggested change

revision: v1

revision: r2

electrocucaracha · 2023-12-18T18:15:06Z

e2e/tests/oai/002.sh

 k8s_wait_ready_replicas "deployment" "oai-upf-controller" "$(k8s_get_capi_kubeconfig "edge")" "oai-operators"
+k8s_wait_ready_replicas "deployment" "oai-ran-operator" "$(k8s_get_capi_kubeconfig "regional")" "oai-ran-operators"
+k8s_wait_ready_replicas "deployment" "oai-ran-operator" "$(k8s_get_capi_kubeconfig "edge")" "oai-ran-operators"


Maybe we can store the value of kubeconfig of the edge and reuse it.

Suggested change

k8s_wait_ready_replicas "deployment" "oai-upf-controller" "$(k8s_get_capi_kubeconfig "edge")" "oai-operators"

k8s_wait_ready_replicas "deployment" "oai-ran-operator" "$(k8s_get_capi_kubeconfig "regional")" "oai-ran-operators"

k8s_wait_ready_replicas "deployment" "oai-ran-operator" "$(k8s_get_capi_kubeconfig "edge")" "oai-ran-operators"

_edge_kubeconfig="$(k8s_get_capi_kubeconfig "edge")"

k8s_wait_ready_replicas "deployment" "oai-upf-controller" "$_edge_kubeconfig" "oai-operators"

k8s_wait_ready_replicas "deployment" "oai-ran-operator" "$(k8s_get_capi_kubeconfig "regional")" "oai-ran-operators"

k8s_wait_ready_replicas "deployment" "oai-ran-operator" "$_edge_kubeconfig" "oai-ran-operators"

electrocucaracha · 2023-12-18T18:17:29Z

e2e/tests/oai/004.sh

+cat <<EOF | kubectl apply -f -
+apiVersion: config.porch.kpt.dev/v1alpha1
+kind: PackageVariant
+metadata:
+  name: oai-cucp
+spec:
+  upstream:
+    repo: oai-ran-packages
+    package: pkg-example-cucp-bp
+    revision: v1
+  downstream:
+    repo: regional
+    package: oai-ran-cucp
+  annotations:
+    approval.nephio.org/policy: initial
+  injectors:
+  - name: regional
+EOF


I think that we can create a separate file for this.

electrocucaracha · 2023-12-18T18:18:32Z

e2e/tests/oai/004.sh

+# shellcheck source=e2e/lib/porch.sh
+source "${LIBDIR}/porch.sh"
+
+# shellcheck source=e2e/lib/_assertions.sh
+source "${LIBDIR}/_assertions.sh"


I don't think that the functions stored in these files are being used

electrocucaracha · 2023-12-18T18:21:09Z

e2e/tests/oai/005.sh

+# shellcheck source=e2e/lib/porch.sh
+source "${LIBDIR}/porch.sh"
+
+# shellcheck source=e2e/lib/_assertions.sh
+source "${LIBDIR}/_assertions.sh"


Same thing here, I don't think those are being used

electrocucaracha · 2023-12-18T18:21:48Z

e2e/tests/oai/005.sh

+cat <<EOF | kubectl apply -f -
+apiVersion: config.porch.kpt.dev/v1alpha1
+kind: PackageVariant
+metadata:
+  name: oai-ue
+spec:
+  upstream:
+    repo: oai-ran-packages
+    package: pkg-example-ue-bp
+    revision: v1
+  downstream:
+    repo: edge
+    package: oai-ran-ue
+  annotations:
+    approval.nephio.org/policy: initial
+  injectors:
+  - name: edge
+EOF


We can keep this code in a separate yaml file

Signed-off-by: Victor Morales <v.morales@samsung.com>

Some OAI RAN fixes

radoslawc · 2024-01-02T16:43:57Z

/approve

Signed-off-by: josephthaliath <jo.thaliath@samsung.com>

electrocucaracha · 2024-01-04T16:59:41Z

@josephthaliath could you fill some information in the PR's description? I'll be reviewing the errors

josephthaliath · 2024-01-05T00:18:34Z

@josephthaliath could you fill some information in the PR's description? I'll be reviewing the errors

@electrocucaracha , I have updated PR description

radoslawc · 2024-01-15T14:38:57Z

/test e2e-free5gc-ubuntu-focal
/test e2e-oai-ubuntu-jammy

electrocucaracha · 2024-01-15T16:10:06Z

@radoslawc this PR depends on #230

electrocucaracha

These suggestions require merging the #230

e2e/tests/oai/002-oai-operators.yaml

e2e/tests/oai/004-ran-cucp.yaml

e2e/tests/oai/004.sh

e2e/tests/oai/005.sh

Co-authored-by: Victor Morales <chipahuac@hotmail.com>

electrocucaracha · 2024-01-17T17:40:33Z

@josephthaliath did you rebase this PR with the latest changes?

electrocucaracha · 2024-01-17T21:20:59Z

It seems like the tests are passing the 75 min threshold, so we will need this change to increase the timeout

arora-sagar · 2024-01-17T22:28:41Z

@josephthaliath Can you avoid deploying RAN operator on the core cluster if possible?

arora-sagar · 2024-01-17T22:36:13Z

@josephthaliath @electrocucaracha I merged this with main branch and everything went well. The end to end test was working fine. Here you can see some numbers.

./init.sh --> 12 mins
001.sh --> 20:49:23 -- 21:06:04 --> 15 mins
002.sh --> 21:06:58 -- 21:09:59 --> 3 mins
003.sh --> 21:11:37 -- 21:42:26 --> 31 mins 
004.sh --> 22:00:46 -- 22:24:15 --> 24 mins
005.sh --> 22:26:10 -- 22:27:43 --> 1 min

I think the timeout for end to end test should be 100 or 120 mins to be on the safe side. We can reduce it if we see it takes less time.

Signed-off-by: josephthaliath <jo.thaliath@samsung.com>

arora-sagar · 2024-01-18T16:26:10Z

test-infra_18jan_v1.diff

@josephthaliath I don't think this file is needed

@arora-sagar . Thanks. added by mistake. removed it.

Signed-off-by: josephthaliath <jo.thaliath@samsung.com>

electrocucaracha · 2024-01-22T20:54:26Z

/lgtm
/approve

nephio-prow · 2024-01-22T20:54:31Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: electrocucaracha, radoslawc

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [electrocucaracha,radoslawc]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

electrocucaracha · 2024-01-22T21:11:58Z

/override e2e-free5gc-fedora-34
/override e2e-free5gc-ubuntu-focal
/override e2e-oai-ubuntu-jammy

nephio-prow · 2024-01-22T21:12:03Z

@electrocucaracha: Overrode contexts on behalf of electrocucaracha: e2e-free5gc-fedora-34, e2e-free5gc-ubuntu-focal, e2e-oai-ubuntu-jammy

In response to this:

/override e2e-free5gc-fedora-34
/override e2e-free5gc-ubuntu-focal
/override e2e-oai-ubuntu-jammy

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

* Changes to add ue and ran deployment scripts * changes to repo register and name corrections * changes to file permissions * Some OAI RAN fixes Signed-off-by: Victor Morales <v.morales@samsung.com> * remove private catalog repository reference * Changes to correct scripts to work on different setups Signed-off-by: josephthaliath <jo.thaliath@samsung.com> * Change repo name in 002-oai-operators.yaml Co-authored-by: Victor Morales <chipahuac@hotmail.com> * Update repo in 004-ran-cucp.yaml Co-authored-by: Victor Morales <chipahuac@hotmail.com> * Update year in 004-ran-cucp.yaml Co-authored-by: Victor Morales <chipahuac@hotmail.com> * year update in 004.sh Co-authored-by: Victor Morales <chipahuac@hotmail.com> * Update repo information in 004.sh Co-authored-by: Victor Morales <chipahuac@hotmail.com> * update year in 005.sh Co-authored-by: Victor Morales <chipahuac@hotmail.com> * Update repo in 005.sh Co-authored-by: Victor Morales <chipahuac@hotmail.com> * changes to deploy ran operator only in regional and edge cluster Signed-off-by: josephthaliath <jo.thaliath@samsung.com> * Corrections to package variant names Signed-off-by: josephthaliath <jo.thaliath@samsung.com> * removing the file added by mistake Signed-off-by: josephthaliath <jo.thaliath@samsung.com> --------- Signed-off-by: Victor Morales <v.morales@samsung.com> Signed-off-by: josephthaliath <jo.thaliath@samsung.com> Co-authored-by: Victor Morales <v.morales@samsung.com> Co-authored-by: Victor Morales <chipahuac@hotmail.com>

josephthaliath added 2 commits December 18, 2023 22:48

Changes to add ue and ran deployment scripts

11a3cbb

changes to repo register and name corrections

8d1ba39

nephio-prow bot requested review from johnbelamaric and radoslawc December 18, 2023 18:01

nephio-prow bot added the needs-ok-to-test label Dec 18, 2023

nephio-prow bot added ok-to-test and removed needs-ok-to-test labels Dec 18, 2023

changes to file permissions

beb6bda

electrocucaracha suggested changes Dec 18, 2023

View reviewed changes

electrocucaracha and others added 3 commits December 18, 2023 14:10

Some OAI RAN fixes

0038540

Signed-off-by: Victor Morales <v.morales@samsung.com>

Merge pull request #1 from electrocucaracha/004_005

c149587

Some OAI RAN fixes

remove private catalog repository reference

a569dd0

nephio-prow bot added the approved label Jan 2, 2024

Changes to correct scripts to work on different setups

9cb1e2c

Signed-off-by: josephthaliath <jo.thaliath@samsung.com>

josephthaliath mentioned this pull request Jan 3, 2024

Test infra set up for OAI RAN and core testing nephio-project/nephio#439

Closed

electrocucaracha suggested changes Jan 16, 2024

View reviewed changes

josephthaliath and others added 7 commits January 17, 2024 21:31

Change repo name in 002-oai-operators.yaml

ce89543

Co-authored-by: Victor Morales <chipahuac@hotmail.com>

Update repo in 004-ran-cucp.yaml

d7014ea

Co-authored-by: Victor Morales <chipahuac@hotmail.com>

Update year in 004-ran-cucp.yaml

0693dc6

Co-authored-by: Victor Morales <chipahuac@hotmail.com>

year update in 004.sh

eea8817

Co-authored-by: Victor Morales <chipahuac@hotmail.com>

Update repo information in 004.sh

6d27a31

Co-authored-by: Victor Morales <chipahuac@hotmail.com>

update year in 005.sh

9bca1ac

Co-authored-by: Victor Morales <chipahuac@hotmail.com>

Update repo in 005.sh

60ff743

Co-authored-by: Victor Morales <chipahuac@hotmail.com>

Merge branch 'nephio-project:main' into main

f52ea9e

josephthaliath added 2 commits January 18, 2024 19:10

changes to deploy ran operator only in regional and edge cluster

07783a0

Signed-off-by: josephthaliath <jo.thaliath@samsung.com>

Corrections to package variant names

55642c8

Signed-off-by: josephthaliath <jo.thaliath@samsung.com>

arora-sagar reviewed Jan 18, 2024

View reviewed changes

removing the file added by mistake

5395549

Signed-off-by: josephthaliath <jo.thaliath@samsung.com>

nephio-prow bot assigned electrocucaracha Jan 22, 2024

nephio-prow bot added the lgtm label Jan 22, 2024

nephio-prow bot merged commit b4c1d96 into nephio-project:main Jan 22, 2024
5 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adding OAI RAN and UE test deployment scripts #227

Adding OAI RAN and UE test deployment scripts #227

josephthaliath commented Dec 18, 2023 •

edited

Loading

nephio-prow bot commented Dec 18, 2023

johnbelamaric commented Dec 18, 2023

electrocucaracha left a comment

electrocucaracha Dec 18, 2023

electrocucaracha Dec 18, 2023

electrocucaracha Dec 18, 2023

electrocucaracha Dec 18, 2023

electrocucaracha Dec 18, 2023

electrocucaracha Dec 18, 2023

electrocucaracha Dec 18, 2023

electrocucaracha Dec 18, 2023

radoslawc commented Jan 2, 2024

electrocucaracha commented Jan 4, 2024

josephthaliath commented Jan 5, 2024

radoslawc commented Jan 15, 2024

electrocucaracha commented Jan 15, 2024

electrocucaracha left a comment

electrocucaracha commented Jan 17, 2024

electrocucaracha commented Jan 17, 2024

arora-sagar commented Jan 17, 2024

arora-sagar commented Jan 17, 2024

arora-sagar Jan 18, 2024

josephthaliath Jan 19, 2024

electrocucaracha commented Jan 22, 2024

nephio-prow bot commented Jan 22, 2024

electrocucaracha commented Jan 22, 2024

nephio-prow bot commented Jan 22, 2024

Adding OAI RAN and UE test deployment scripts #227

Adding OAI RAN and UE test deployment scripts #227

Conversation

josephthaliath commented Dec 18, 2023 • edited Loading

nephio-prow bot commented Dec 18, 2023

johnbelamaric commented Dec 18, 2023

electrocucaracha left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

radoslawc commented Jan 2, 2024

electrocucaracha commented Jan 4, 2024

josephthaliath commented Jan 5, 2024

radoslawc commented Jan 15, 2024

electrocucaracha commented Jan 15, 2024

electrocucaracha left a comment

Choose a reason for hiding this comment

electrocucaracha commented Jan 17, 2024

electrocucaracha commented Jan 17, 2024

arora-sagar commented Jan 17, 2024

arora-sagar commented Jan 17, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

electrocucaracha commented Jan 22, 2024

nephio-prow bot commented Jan 22, 2024

electrocucaracha commented Jan 22, 2024

nephio-prow bot commented Jan 22, 2024

josephthaliath commented Dec 18, 2023 •

edited

Loading