diff --git a/e2e/provision/Vagrantfile b/e2e/provision/Vagrantfile index 334f4629..84322b34 100644 --- a/e2e/provision/Vagrantfile +++ b/e2e/provision/Vagrantfile @@ -59,7 +59,7 @@ Vagrant.configure('2') do |config| NEPHIO_RUN_E2E: ENV.fetch('NEPHIO_RUN_E2E', false), NEPHIO_USER: ENV.fetch('NEPHIO_USER', 'vagrant'), NEPHIO_REPO_DIR: '/opt/test-infra', - ANSIBLE_CMD_EXTRA_VAR_LIST: "k8s.context='kind-kind' nephio_pkg_version= '#{ENV['NEPHIO_PKG_VERSION'] || 'main'}' nephio_example_repo_uri='#{ENV['NEPHIO_EXAMPLE_REPO_URI'] || 'https://github.com/nephio-project/nephio-example-packages.git'}'", + ANSIBLE_CMD_EXTRA_VAR_LIST: "k8s.context='kind-kind' nephio_catalog_repo_uri='#{ENV['NEPHIO_CATALOG_REPO_URI'] || 'https://github.com/nephio-project/nephio-catalog-packages.git'}'", E2EDIR: '/opt/test-infra/e2e', E2ETYPE: ENV.fetch('E2ETYPE', 'free5gc') } diff --git a/e2e/provision/init.sh b/e2e/provision/init.sh index 1d70847d..87a94b20 100755 --- a/e2e/provision/init.sh +++ b/e2e/provision/init.sh @@ -58,9 +58,8 @@ RUN_E2E=${NEPHIO_RUN_E2E:-$(get_metadata nephio-run-e2e "false")} REPO=${NEPHIO_REPO:-$(get_metadata nephio-test-infra-repo "https://github.com/nephio-project/test-infra.git")} BRANCH=${NEPHIO_BRANCH:-$(get_metadata nephio-test-infra-branch "main")} NEPHIO_USER=${NEPHIO_USER:-$(get_metadata nephio-user "ubuntu")} -NEPHIO_PKG_VERSION=${NEPHIO_PKG_VERSION:-$(get_metadata nephio-pkg-version "main")} -NEPHIO_EXAMPLE_REPO_URI=${NEPHIO_EXAMPLE_REPO_URI:-$(get_metadata nephio-example-repo-uri "https://github.com/nephio-project/nephio-example-packages.git")} -export ANSIBLE_CMD_EXTRA_VAR_LIST="nephio_pkg_version='$NEPHIO_PKG_VERSION' nephio_example_repo_uri='$NEPHIO_EXAMPLE_REPO_URI'" +NEPHIO_CATALOG_REPO_URI=${NEPHIO_CATALOG_REPO_URI:-$(get_metadata nephio-catalog-repo-uri "https://github.com/nephio-project/catalog.git")} +export ANSIBLE_CMD_EXTRA_VAR_LIST="nephio_catalog_repo_uri='$NEPHIO_CATALOG_REPO_URI'" HOME=${NEPHIO_HOME:-/home/$NEPHIO_USER} REPO_DIR=${NEPHIO_REPO_DIR:-$HOME/test-infra} DOCKERHUB_USERNAME=${DOCKERHUB_USERNAME:-""} diff --git a/e2e/provision/playbooks/cluster.yml b/e2e/provision/playbooks/cluster.yml index ea0a4ee3..9fecdfa9 100644 --- a/e2e/provision/playbooks/cluster.yml +++ b/e2e/provision/playbooks/cluster.yml @@ -90,13 +90,13 @@ ansible.builtin.include_role: name: andrewrothstein.kpt vars: - kpt_ver: '1.0.0-beta.38' + kpt_ver: '1.0.0-beta.49' kpt_checksums: - '1.0.0-beta.38': - linux_amd64: sha256:e58b13b6069c70a5f0c4154aa2a548b09a9d21b9e9e7c2d935807f9943d92db4 - linux_arm64: sha256:168fd10c69e446e8e9d408a338e937b51ba4d7bd3bf986691c1e97c52a1e3d7d - darwin_amd64: sha256:488943eca09e2a994a2a57d85729e49af241eac69bd0e3e6c1ad76507bcb6357 - darwin_arm64: sha256:8673953ad01ae806d93b5fffcaf42482ddbace7d0cd81424391b57d6c7ad6665 + '1.0.0-beta.49': + linux_amd64: sha256:8de2996018992ea946c9002aa43c85250a78d9fa3eb1c8da24c7878d7d24b9b7 + linux_arm64: sha256:18dfb4540eeed32d2bdded612b3aa678cee6fdcdb14813e184c1a54b4ca35b56 + darwin_amd64: sha256:558c1b082a8f1221b88cf6728178076190adda58db84e129ffb40f1e2a462759 + darwin_arm64: sha256:bbaa7c6b4c7af0f9cdda694476a9b3b8d9fdd8fba3c0c0ec49f4f26687a2527a - name: Download CNI plugins ansible.builtin.include_role: name: darkwizard242.cni @@ -131,14 +131,14 @@ ansible.builtin.include_role: name: kpt loop: - - {pkg: repository, dest: /tmp/repository/mgmt} - - {pkg: rootsync, dest: /tmp/rootsync/mgmt} - - {pkg: repository, dest: /tmp/repository/mgmt-staging} + - {pkg: distros/sandbox/repository, dest: /tmp/repository/mgmt} + - {pkg: nephio/optional/rootsync, dest: /tmp/rootsync/mgmt} + - {pkg: distros/sandbox/repository, dest: /tmp/repository/mgmt-staging} vars: - repo_uri: "{{ nephio_example_repo_uri }}" + repo_uri: "{{ nephio_catalog_repo_uri }}" local_dest_directory: "{{ item.dest }}" pkg: "{{ item.pkg }}" - version: "{{ nephio_pkg_version }}" + version: main for_deployment: true context: "{{ k8s.context }}" kpt_async: 900 diff --git a/e2e/provision/playbooks/roles/bootstrap/README.md b/e2e/provision/playbooks/roles/bootstrap/README.md index eceed4c3..ffbf1c9d 100644 --- a/e2e/provision/playbooks/roles/bootstrap/README.md +++ b/e2e/provision/playbooks/roles/bootstrap/README.md @@ -24,8 +24,7 @@ Available variables are listed below, along with default values (see defaults/ma | k8s.context | no | kind-kind | | Kubernetes context to create gitea resources | | k8s.version | no | v1.27.1 | | Kubernetes version used for the management cluster | | kind.enabled | no | true | true, false | Enable/Disable Kubernetes Cluster creation | -| nephio_pkg_version | no | v1.0.1 | | Default version for all kpt packages | -| nephio_example_repo_uri | no | https://github.com/nephio-project/nephio-example-packages.git | | Default kpt examples packages repository | +| nephio_catalog_repo_uri | no | https://github.com/nephio-project/catalog.git | | Default kpt catalog packages repository | | gitea.enabled | no | true | true, false | Enable/Disable gitea services | | gitea.k8s.namespace | no | gitea | | Kubernetes namespace for gitea resources | | gitea.k8s.postgres_password | no | c2VjcmV0 | | `postgres-password` secret value for gitea database service | @@ -75,7 +74,7 @@ The `install` Ansible role depends on the outcome generated by this role. become_user: root ansible.builtin.unarchive: remote_src: true - src: https://github.com/GoogleContainerTools/kpt/releases/download/v1.0.0-beta.38/kpt_linux_amd64-1.0.0-beta.38.tar.gz + src: https://github.com/GoogleContainerTools/kpt/releases/download/v1.0.0-beta.49/kpt_linux_amd64-1.0.0-beta.49.tar.gz dest: /usr/local/bin/ creates: /usr/local/bin/kpt - name: Install KinD command-line diff --git a/e2e/provision/playbooks/roles/bootstrap/defaults/main.yml b/e2e/provision/playbooks/roles/bootstrap/defaults/main.yml index c28fe418..0a562f92 100644 --- a/e2e/provision/playbooks/roles/bootstrap/defaults/main.yml +++ b/e2e/provision/playbooks/roles/bootstrap/defaults/main.yml @@ -25,8 +25,7 @@ k8s: kind: enabled: true -nephio_pkg_version: v1.0.1 -nephio_example_repo_uri: https://github.com/nephio-project/nephio-example-packages.git +nephio_catalog_repo_uri: https://github.com/nephio-project/catalog.git gitea: enabled: true @@ -40,9 +39,9 @@ gitea: - gitea kpt: packages: - - repo_uri: "{{ nephio_example_repo_uri }}" - pkg: gitea - version: "{{ nephio_pkg_version }}" + - repo_uri: "{{ nephio_catalog_repo_uri }}" + pkg: distros/sandbox/gitea + version: main async: 780 poll: 0 @@ -53,9 +52,9 @@ resource_backend: - backend-system kpt: packages: - - repo_uri: "{{ nephio_example_repo_uri }}" - pkg: resource-backend - version: "{{ nephio_pkg_version }}" + - repo_uri: "{{ nephio_catalog_repo_uri }}" + pkg: nephio/optional/resource-backend + version: main async: 780 poll: 0 @@ -66,9 +65,9 @@ cert_manager: - cert-manager kpt: packages: - - repo_uri: "{{ nephio_example_repo_uri }}" - pkg: cert-manager - version: "{{ nephio_pkg_version }}" + - repo_uri: "{{ nephio_catalog_repo_uri }}" + pkg: distros/sandbox/cert-manager + version: main async: 660 poll: 0 @@ -82,19 +81,19 @@ cluster_api: - capd-system kpt: packages: - - repo_uri: "{{ nephio_example_repo_uri }}" - pkg: cluster-capi - version: "{{ nephio_pkg_version }}" + - repo_uri: "{{ nephio_catalog_repo_uri }}" + pkg: infra/capi/cluster-capi + version: main async: 900 poll: 5 - - repo_uri: "{{ nephio_example_repo_uri }}" - pkg: cluster-capi-infrastructure-docker - version: "{{ nephio_pkg_version }}" + - repo_uri: "{{ nephio_catalog_repo_uri }}" + pkg: infra/capi/cluster-capi-infrastructure-docker + version: main async: 780 poll: 5 - - repo_uri: "{{ nephio_example_repo_uri }}" - pkg: cluster-capi-kind-docker-templates - version: "{{ nephio_pkg_version }}" + - repo_uri: "{{ nephio_catalog_repo_uri }}" + pkg: infra/capi/cluster-capi-kind-docker-templates + version: main async: 1500 poll: 0 @@ -105,13 +104,13 @@ metallb: - metallb-system kpt: packages: - - repo_uri: "{{ nephio_example_repo_uri }}" - pkg: metallb - version: "{{ nephio_pkg_version }}" + - repo_uri: "{{ nephio_catalog_repo_uri }}" + pkg: distros/sandbox/metallb + version: main async: 1020 poll: 5 - - repo_uri: "{{ nephio_example_repo_uri }}" - pkg: metallb-sandbox-config - version: "{{ nephio_pkg_version }}" + - repo_uri: "{{ nephio_catalog_repo_uri }}" + pkg: distros/sandbox/metallb-sandbox-config + version: main async: 660 poll: 0 diff --git a/e2e/provision/playbooks/roles/bootstrap/molecule/default/prepare.yml b/e2e/provision/playbooks/roles/bootstrap/molecule/default/prepare.yml index a26b4d23..fefb96e5 100644 --- a/e2e/provision/playbooks/roles/bootstrap/molecule/default/prepare.yml +++ b/e2e/provision/playbooks/roles/bootstrap/molecule/default/prepare.yml @@ -44,6 +44,6 @@ become_user: root ansible.builtin.unarchive: remote_src: true - src: https://github.com/GoogleContainerTools/kpt/releases/download/v1.0.0-beta.38/kpt_linux_amd64-1.0.0-beta.38.tar.gz + src: https://github.com/GoogleContainerTools/kpt/releases/download/v1.0.0-beta.49/kpt_linux_amd64-1.0.0-beta.49.tar.gz dest: /usr/local/bin/ creates: /usr/local/bin/kpt diff --git a/e2e/provision/playbooks/roles/bootstrap/tasks/main.yml b/e2e/provision/playbooks/roles/bootstrap/tasks/main.yml index 29e16349..575cc3a8 100644 --- a/e2e/provision/playbooks/roles/bootstrap/tasks/main.yml +++ b/e2e/provision/playbooks/roles/bootstrap/tasks/main.yml @@ -24,11 +24,32 @@ ansible.builtin.include_tasks: create-mgmt.yml when: kind.enabled -- name: Create Gitea K8s resources - ansible.builtin.include_tasks: prep-gitea.yml - when: - - gitea.enabled - - nephio_pkg_version is match("v([0-9]+)\.([0-9]+)\.([0-9]+)") and nephio_pkg_version | replace("v",'') is version('1.0.1', '<=') - - name: Apply kpt packages ansible.builtin.include_tasks: apply-pkgs.yml + +- name: Create docker hub secret + when: + - lookup('ansible.builtin.env', 'DOCKERHUB_USERNAME') | length > 0 + - lookup('ansible.builtin.env', 'DOCKERHUB_TOKEN') | length > 0 + vars: + username: "{{ lookup('ansible.builtin.env', 'DOCKERHUB_USERNAME') }}" + token: "{{ lookup('ansible.builtin.env', 'DOCKERHUB_TOKEN') }}" + block: + - name: Create docker-registry secret + ansible.builtin.command: > + kubectl create secret docker-registry dockerhub --docker-username={{ username }} + --docker-password={{ token }} -n {{ gitea.k8s.namespace }} + changed_when: false + - name: Create docker-registry service account + no_log: true + kubernetes.core.k8s: + context: "{{ k8s.context }}" + state: present + definition: + apiVersion: v1 + kind: ServiceAccount + imagePullSecrets: + - name: dockerhub + metadata: + name: default + namespace: "{{ gitea.k8s.namespace }}" diff --git a/e2e/provision/playbooks/roles/bootstrap/tasks/prep-gitea.yml b/e2e/provision/playbooks/roles/bootstrap/tasks/prep-gitea.yml deleted file mode 100644 index 26da3460..00000000 --- a/e2e/provision/playbooks/roles/bootstrap/tasks/prep-gitea.yml +++ /dev/null @@ -1,81 +0,0 @@ ---- -# SPDX-license-identifier: Apache-2.0 -############################################################################## -# Copyright (c) 2023 The Nephio Authors. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - -- name: Create gitea namespace - kubernetes.core.k8s: - context: "{{ k8s.context }}" - state: present - definition: - apiVersion: v1 - kind: Namespace - metadata: - name: "{{ gitea.k8s.namespace }}" - -- name: Create docker hub secret - when: - - lookup('ansible.builtin.env', 'DOCKERHUB_USERNAME') | length > 0 - - lookup('ansible.builtin.env', 'DOCKERHUB_TOKEN') | length > 0 - vars: - username: "{{ lookup('ansible.builtin.env', 'DOCKERHUB_USERNAME') }}" - token: "{{ lookup('ansible.builtin.env', 'DOCKERHUB_TOKEN') }}" - block: - - name: Create docker-registry secret - ansible.builtin.command: > - kubectl create secret docker-registry dockerhub --docker-username={{ username }} - --docker-password={{ token }} -n {{ gitea.k8s.namespace }} - changed_when: false - - name: Create docker-registry service account - no_log: true - kubernetes.core.k8s: - context: "{{ k8s.context }}" - state: present - definition: - apiVersion: v1 - kind: ServiceAccount - imagePullSecrets: - - name: dockerhub - metadata: - name: default - namespace: "{{ gitea.k8s.namespace }}" - -- name: Create gitea postgresql user password - kubernetes.core.k8s: - context: "{{ k8s.context }}" - state: present - definition: - apiVersion: v1 - kind: Secret - metadata: - name: gitea-postgresql - namespace: "{{ gitea.k8s.namespace }}" - labels: - app.kubernetes.io/name: postgresql - app.kubernetes.io/instance: gitea - type: Opaque - data: - postgres-password: "{{ gitea.k8s.postgres_password }}" - password: "{{ gitea.k8s.db_password }}" - no_log: true - -- name: Create gitea user password - kubernetes.core.k8s: - context: "{{ k8s.context }}" - state: present - definition: - apiVersion: v1 - kind: Secret - metadata: - name: git-user-secret - namespace: "{{ gitea.k8s.namespace }}" - type: kubernetes.io/basic-auth - stringData: - username: "{{ gitea.k8s.username }}" - password: "{{ gitea.k8s.password }}" - no_log: true diff --git a/e2e/provision/playbooks/roles/install/README.md b/e2e/provision/playbooks/roles/install/README.md index 677561d2..500ed32f 100644 --- a/e2e/provision/playbooks/roles/install/README.md +++ b/e2e/provision/playbooks/roles/install/README.md @@ -17,8 +17,7 @@ Available variables are listed below, along with default values (see defaults/ma | k8s.context | no | kind-kind | | Kubernetes context to create resources | | gitea.k8s.username | no | nephio | | Gitea admin user name | | gitea.k8s.password | no | secret | | Gitea admin password | -| nephio_pkg_version | no | v1.0.1 | | Default version for all kpt packages | -| nephio_example_repo_uri | no | https://github.com/nephio-project/nephio-example-packages.git | | Default kpt examples packages repository | +| nephio_catalog_repo_uri | no | https://github.com/nephio-project/catalog.git | | Default kpt catalog packages repository | | nephio.k8s.namespaces | no | | | List of Kubernetes namespaces to watch for Nephio deployment resources | | nephio.kpt.packages | no | | | List of Nephio kpt packages | | nephio_webui.k8s.namespace | no | nephio-webui | | Kubernetes namespace for Nephio WebUI resources | @@ -52,7 +51,7 @@ None become_user: root ansible.builtin.unarchive: remote_src: true - src: https://github.com/GoogleContainerTools/kpt/releases/download/v1.0.0-beta.38/kpt_linux_amd64-1.0.0-beta.38.tar.gz + src: https://github.com/GoogleContainerTools/kpt/releases/download/v1.0.0-beta.49/kpt_linux_amd64-1.0.0-beta.49.tar.gz dest: /usr/local/bin/ creates: /usr/local/bin/kpt - name: Install Docker Engine diff --git a/e2e/provision/playbooks/roles/install/defaults/main.yml b/e2e/provision/playbooks/roles/install/defaults/main.yml index 2658cbec..5690ce5f 100644 --- a/e2e/provision/playbooks/roles/install/defaults/main.yml +++ b/e2e/provision/playbooks/roles/install/defaults/main.yml @@ -16,22 +16,41 @@ gitea: username: nephio password: secret -nephio_pkg_version: v1.0.1 -nephio_example_repo_uri: https://github.com/nephio-project/nephio-example-packages.git +nephio_catalog_repo_uri: https://github.com/nephio-project/catalog.git nephio_stock_repos: - - name: nephio-example-packages - repo: "{{ nephio_example_repo_uri }}" + - name: catalog-distros-sandbox + repo: "{{ nephio_catalog_repo_uri }}" + directory: /distros/sandbox branch: main - - name: free5gc-packages - repo: https://github.com/nephio-project/free5gc-packages.git + - name: catalog-workloads-free5gc + repo: "{{ nephio_catalog_repo_uri }}" + directory: /workloads/free5gc branch: main - - name: catalog - repo: https://github.com/nephio-project/catalog.git + - name: catalog-infra-capi + repo: "{{ nephio_catalog_repo_uri }}" + directory: /infra/capi branch: main - - name: oai-packages + - name: catalog-nephio-core + repo: "{{ nephio_catalog_repo_uri }}" + directory: /nephio/core + branch: main + - name: catalog-nephio-optional + repo: "{{ nephio_catalog_repo_uri }}" + directory: /nephio/optional + branch: main + - name: oai-core-packages repo: https://github.com/OPENAIRINTERFACE/oai-packages.git + directory: / branch: r2 + - name: catalog-workloads-oai-ran + repo: "{{ nephio_catalog_repo_uri }}" + directory: /workloads/oai + branch: main + - name: catalog-workloads-tools + repo: "{{ nephio_catalog_repo_uri }}" + directory: /workloads/tools + branch: main nephio: k8s: @@ -44,24 +63,24 @@ nephio: - resource-group-system kpt: packages: - - repo_uri: "{{ nephio_example_repo_uri }}" - pkg: porch-dev - version: "{{ nephio_pkg_version }}" + - repo_uri: "{{ nephio_catalog_repo_uri }}" + pkg: nephio/core/porch + version: main async: 480 poll: 5 - - repo_uri: "{{ nephio_example_repo_uri }}" - pkg: nephio-controllers - version: "{{ nephio_pkg_version }}" + - repo_uri: "{{ nephio_catalog_repo_uri }}" + pkg: nephio/core/nephio-operator + version: main async: 480 poll: 5 - - repo_uri: "{{ nephio_example_repo_uri }}" - pkg: configsync - version: "{{ nephio_pkg_version }}" + - repo_uri: "{{ nephio_catalog_repo_uri }}" + pkg: nephio/core/configsync + version: main async: 240 poll: 5 - - repo_uri: "{{ nephio_example_repo_uri }}" - pkg: network-config - version: "{{ nephio_pkg_version }}" + - repo_uri: "{{ nephio_catalog_repo_uri }}" + pkg: nephio/optional/network-config + version: main async: 480 poll: 0 @@ -70,6 +89,6 @@ nephio_webui: namespace: nephio-webui kpt: package: - repo_uri: https://github.com/nephio-project/nephio-packages.git - pkg: nephio-webui - version: "{{ nephio_pkg_version }}" + repo_uri: "{{ nephio_catalog_repo_uri }}" + pkg: nephio/optional/webui + version: main diff --git a/e2e/provision/playbooks/roles/install/molecule/default/tests/test_default.py b/e2e/provision/playbooks/roles/install/molecule/default/tests/test_default.py index f760bc9b..282f53f4 100644 --- a/e2e/provision/playbooks/roles/install/molecule/default/tests/test_default.py +++ b/e2e/provision/playbooks/roles/install/molecule/default/tests/test_default.py @@ -69,10 +69,12 @@ def test_network_config_deployments_creation(host): def test_repositories_creation(host): expected = [ - "free5gc-packages", - "nephio-example-packages", - "catalog", - "oai-packages", + "catalog-workloads-free5gc", + "catalog-infra-capi", + "catalog-nephio-core", + "catalog-nephio-optional", + "oai-core-packages", + "catalog-workloads-oai-ran", ] got = host.check_output( "kubectl get repositories -o \ diff --git a/e2e/provision/playbooks/roles/install/tasks/main.yml b/e2e/provision/playbooks/roles/install/tasks/main.yml index be7f1912..3d321ebd 100644 --- a/e2e/provision/playbooks/roles/install/tasks/main.yml +++ b/e2e/provision/playbooks/roles/install/tasks/main.yml @@ -90,7 +90,7 @@ deployment: false git: branch: "{{ item.branch }}" - directory: / + directory: "{{ item.directory }}" repo: "{{ item.repo }}" type: git loop: "{{ nephio_stock_repos }}" @@ -109,5 +109,9 @@ type: Ready status: true loop: - - nephio-example-packages - - free5gc-packages + - catalog-infra-capi + - catalog-nephio-core + - catalog-nephio-optional + - catalog-workloads-free5gc + - catalog-workloads-oai-ran + - oai-core-packages diff --git a/e2e/provision/playbooks/roles/kpt/README.md b/e2e/provision/playbooks/roles/kpt/README.md index b1bc2538..910e9f75 100644 --- a/e2e/provision/playbooks/roles/kpt/README.md +++ b/e2e/provision/playbooks/roles/kpt/README.md @@ -29,7 +29,7 @@ None become_user: root ansible.builtin.unarchive: remote_src: true - src: https://github.com/GoogleContainerTools/kpt/releases/download/v1.0.0-beta.38/kpt_linux_amd64-1.0.0-beta.38.tar.gz + src: https://github.com/GoogleContainerTools/kpt/releases/download/v1.0.0-beta.49/kpt_linux_amd64-1.0.0-beta.49.tar.gz dest: /usr/local/bin/ creates: /usr/local/bin/kpt - name: Install Docker Engine diff --git a/e2e/provision/playbooks/roles/kpt/molecule/default/prepare.yml b/e2e/provision/playbooks/roles/kpt/molecule/default/prepare.yml index 4a8d0cda..30a01a62 100644 --- a/e2e/provision/playbooks/roles/kpt/molecule/default/prepare.yml +++ b/e2e/provision/playbooks/roles/kpt/molecule/default/prepare.yml @@ -37,7 +37,7 @@ become_user: root ansible.builtin.unarchive: remote_src: true - src: https://github.com/GoogleContainerTools/kpt/releases/download/v1.0.0-beta.38/kpt_linux_amd64-1.0.0-beta.38.tar.gz + src: https://github.com/GoogleContainerTools/kpt/releases/download/v1.0.0-beta.49/kpt_linux_amd64-1.0.0-beta.49.tar.gz dest: /usr/local/bin/ creates: /usr/local/bin/kpt - name: Get k8s clusters diff --git a/e2e/provision/playbooks/roles/upgrade/README.md b/e2e/provision/playbooks/roles/upgrade/README.md index e3cc939d..40ab75bd 100644 --- a/e2e/provision/playbooks/roles/upgrade/README.md +++ b/e2e/provision/playbooks/roles/upgrade/README.md @@ -47,7 +47,7 @@ None become_user: root ansible.builtin.unarchive: remote_src: true - src: https://github.com/GoogleContainerTools/kpt/releases/download/v1.0.0-beta.38/kpt_linux_amd64-1.0.0-beta.38.tar.gz + src: https://github.com/GoogleContainerTools/kpt/releases/download/v1.0.0-beta.49/kpt_linux_amd64-1.0.0-beta.49.tar.gz dest: /usr/local/bin/ creates: /usr/local/bin/kpt - name: Install Docker Engine diff --git a/e2e/provision/playbooks/roles/upgrade/molecule/default/prepare.yml b/e2e/provision/playbooks/roles/upgrade/molecule/default/prepare.yml index 8ebf1301..f03051e5 100644 --- a/e2e/provision/playbooks/roles/upgrade/molecule/default/prepare.yml +++ b/e2e/provision/playbooks/roles/upgrade/molecule/default/prepare.yml @@ -36,7 +36,7 @@ become_user: root ansible.builtin.unarchive: remote_src: true - src: https://github.com/GoogleContainerTools/kpt/releases/download/v1.0.0-beta.38/kpt_linux_amd64-1.0.0-beta.38.tar.gz + src: https://github.com/GoogleContainerTools/kpt/releases/download/v1.0.0-beta.49/kpt_linux_amd64-1.0.0-beta.49.tar.gz dest: /usr/local/bin/ creates: /usr/local/bin/kpt - name: Get k8s clusters diff --git a/e2e/tests/free5gc/001.sh b/e2e/tests/free5gc/001.sh index a831005c..0c78bcf0 100755 --- a/e2e/tests/free5gc/001.sh +++ b/e2e/tests/free5gc/001.sh @@ -45,7 +45,7 @@ function assert_workload_resource_contains { assert_contains "$(_curl_workload_cluster_content "$1")" "$2" "$3" } -regional_pkg_rev=$(kpt alpha rpkg clone -n default https://github.com/nephio-project/nephio-example-packages.git/nephio-workload-cluster@v9 --repository mgmt regional | cut -f 1 -d ' ') +regional_pkg_rev=$(kpt alpha rpkg clone -n default https://github.com/nephio-project/catalog.git/infra/capi/nephio-workload-cluster@main --repository mgmt regional | cut -f 1 -d ' ') k8s_wait_exists "packagerev" "$regional_pkg_rev" # Draft creation diff --git a/e2e/tests/free5gc/002-edge-clusters.yaml b/e2e/tests/free5gc/002-edge-clusters.yaml index 116efb06..bea3107a 100644 --- a/e2e/tests/free5gc/002-edge-clusters.yaml +++ b/e2e/tests/free5gc/002-edge-clusters.yaml @@ -14,9 +14,9 @@ metadata: name: edge-clusters spec: upstream: - repo: nephio-example-packages + repo: catalog-infra-capi package: nephio-workload-cluster - revision: v9 + revision: main targets: - repositories: - name: mgmt diff --git a/e2e/tests/free5gc/002-network.yaml b/e2e/tests/free5gc/002-network.yaml index 42827a0c..36c304a5 100644 --- a/e2e/tests/free5gc/002-network.yaml +++ b/e2e/tests/free5gc/002-network.yaml @@ -14,9 +14,9 @@ metadata: name: network spec: upstream: - repo: nephio-example-packages + repo: catalog-distros-sandbox package: network - revision: v1 + revision: main downstream: repo: mgmt package: network diff --git a/e2e/tests/free5gc/003.sh b/e2e/tests/free5gc/003.sh index c3a7463d..4fa756da 100755 --- a/e2e/tests/free5gc/003.sh +++ b/e2e/tests/free5gc/003.sh @@ -33,7 +33,7 @@ source "${LIBDIR}/porch.sh" # shellcheck source=e2e/lib/_assertions.sh source "${LIBDIR}/_assertions.sh" -pkg_rev=$(kpt alpha rpkg clone -n default https://github.com/nephio-project/free5gc-packages.git/free5gc-cp@v1 --repository regional free5gc-cp | cut -f 1 -d ' ') +pkg_rev=$(kpt alpha rpkg clone -n default https://github.com/nephio-project/catalog.git/workloads/free5gc/free5gc-cp@main --repository regional free5gc-cp | cut -f 1 -d ' ') k8s_wait_exists "packagerev" "$pkg_rev" porch_wait_log_entry "Creating packagerev default/regional-" diff --git a/e2e/tests/free5gc/004-free5gc-operator.yaml b/e2e/tests/free5gc/004-free5gc-operator.yaml index b5170982..1cab306c 100644 --- a/e2e/tests/free5gc/004-free5gc-operator.yaml +++ b/e2e/tests/free5gc/004-free5gc-operator.yaml @@ -4,9 +4,9 @@ metadata: name: free5gc-operator spec: upstream: - repo: free5gc-packages + repo: catalog-workloads-free5gc package: free5gc-operator - revision: v5 + revision: main targets: - objectSelector: apiVersion: infra.nephio.org/v1alpha1 diff --git a/e2e/tests/free5gc/005-edge-free5gc-upf.yaml b/e2e/tests/free5gc/005-edge-free5gc-upf.yaml index 50000244..3ad095f8 100644 --- a/e2e/tests/free5gc/005-edge-free5gc-upf.yaml +++ b/e2e/tests/free5gc/005-edge-free5gc-upf.yaml @@ -4,9 +4,9 @@ metadata: name: edge-free5gc-upf spec: upstream: - repo: free5gc-packages + repo: catalog-workloads-free5gc package: pkg-example-upf-bp - revision: v5 + revision: main targets: - objectSelector: apiVersion: infra.nephio.org/v1alpha1 diff --git a/e2e/tests/free5gc/006-regional-free5gc-amf.yaml b/e2e/tests/free5gc/006-regional-free5gc-amf.yaml index 3029f1a5..69befe4d 100644 --- a/e2e/tests/free5gc/006-regional-free5gc-amf.yaml +++ b/e2e/tests/free5gc/006-regional-free5gc-amf.yaml @@ -4,9 +4,9 @@ metadata: name: regional-free5gc-amf spec: upstream: - repo: free5gc-packages + repo: catalog-workloads-free5gc package: pkg-example-amf-bp - revision: v5 + revision: main targets: - objectSelector: apiVersion: infra.nephio.org/v1alpha1 diff --git a/e2e/tests/free5gc/006-regional-free5gc-smf.yaml b/e2e/tests/free5gc/006-regional-free5gc-smf.yaml index 1a4eda46..ab37022c 100644 --- a/e2e/tests/free5gc/006-regional-free5gc-smf.yaml +++ b/e2e/tests/free5gc/006-regional-free5gc-smf.yaml @@ -4,9 +4,9 @@ metadata: name: regional-free5gc-smf spec: upstream: - repo: free5gc-packages + repo: catalog-workloads-free5gc package: pkg-example-smf-bp - revision: v5 + revision: main targets: - objectSelector: apiVersion: infra.nephio.org/v1alpha1 diff --git a/e2e/tests/free5gc/007-edge01-ueransim.yaml b/e2e/tests/free5gc/007-edge01-ueransim.yaml index 878f1a5a..bcd0b8d2 100644 --- a/e2e/tests/free5gc/007-edge01-ueransim.yaml +++ b/e2e/tests/free5gc/007-edge01-ueransim.yaml @@ -4,9 +4,9 @@ metadata: name: edge01-ueransim spec: upstream: - repo: nephio-example-packages + repo: catalog-workloads-tools package: ueransim - revision: v3 + revision: main downstream: repo: edge01 package: ueransim diff --git a/e2e/tests/oai/001-infra.yaml b/e2e/tests/oai/001-infra.yaml index 5db28521..4f7faedd 100644 --- a/e2e/tests/oai/001-infra.yaml +++ b/e2e/tests/oai/001-infra.yaml @@ -14,8 +14,8 @@ metadata: name: oai-core-clusters-mgmt-core spec: upstream: - repo: catalog - package: workloads/oai/workload-cluster + repo: catalog-infra-capi + package: nephio-workload-cluster revision: main downstream: repo: mgmt @@ -35,8 +35,8 @@ metadata: name: oai-regional-clusters spec: upstream: - repo: catalog - package: workloads/oai/workload-cluster + repo: catalog-infra-capi + package: nephio-workload-cluster revision: main targets: - repositories: @@ -59,8 +59,8 @@ metadata: name: oai-edge-clusters spec: upstream: - repo: catalog - package: workloads/oai/workload-cluster + repo: catalog-infra-capi + package: nephio-workload-cluster revision: main targets: - repositories: diff --git a/e2e/tests/oai/001-network.yaml b/e2e/tests/oai/001-network.yaml index dead16b6..36c304a5 100644 --- a/e2e/tests/oai/001-network.yaml +++ b/e2e/tests/oai/001-network.yaml @@ -14,8 +14,8 @@ metadata: name: network spec: upstream: - repo: catalog - package: workloads/oai/network + repo: catalog-distros-sandbox + package: network revision: main downstream: repo: mgmt diff --git a/e2e/tests/oai/001.sh b/e2e/tests/oai/001.sh index 33175ce2..734cd59a 100755 --- a/e2e/tests/oai/001.sh +++ b/e2e/tests/oai/001.sh @@ -43,7 +43,7 @@ function _define_ip_address_pool { pushd "$(mktemp -d -t "001-pkg-XXX")" >/dev/null trap popd RETURN - pkg_rev=$(kpt alpha rpkg clone -n default https://github.com/nephio-project/nephio-example-packages.git/metallb-sandbox-config@v1 --repository mgmt-staging "$cluster-metallb-sandbox-config" | cut -f 1 -d ' ') + pkg_rev=$(kpt alpha rpkg clone -n default https://github.com/nephio-project/catalog.git/distros/sandbox/metallb-sandbox-config@main --repository mgmt-staging "$cluster-metallb-sandbox-config" | cut -f 1 -d ' ') k8s_wait_exists "packagerev" "$pkg_rev" kpt alpha rpkg pull -n default "$pkg_rev" "$cluster-metallb-sandbox-config" kpt fn eval --image "gcr.io/kpt-fn/search-replace:v0.2" "$cluster-metallb-sandbox-config" -- 'by-path=spec.addresses[0]' "put-value=$cidr" diff --git a/e2e/tests/oai/002-oai-operators.yaml b/e2e/tests/oai/002-oai-operators.yaml index d89b0af5..b82280f1 100644 --- a/e2e/tests/oai/002-oai-operators.yaml +++ b/e2e/tests/oai/002-oai-operators.yaml @@ -14,7 +14,7 @@ metadata: name: oai-common spec: upstream: - repo: oai-packages + repo: oai-core-packages package: database revision: r2 targets: @@ -37,7 +37,7 @@ metadata: name: oai-cp-operators spec: upstream: - repo: oai-packages + repo: oai-core-packages package: oai-cp-operators revision: r2 downstream: @@ -54,7 +54,7 @@ metadata: name: oai-up-operators spec: upstream: - repo: oai-packages + repo: oai-core-packages package: oai-up-operators revision: r2 downstream: diff --git a/e2e/tests/oai/003-upf.yaml b/e2e/tests/oai/003-upf.yaml index cfe7b7de..b1221853 100644 --- a/e2e/tests/oai/003-upf.yaml +++ b/e2e/tests/oai/003-upf.yaml @@ -14,7 +14,7 @@ metadata: name: oai-upf-edge spec: upstream: - repo: oai-packages + repo: oai-core-packages package: oai-upf-edge revision: r2 downstream: diff --git a/e2e/tests/oai/003.sh b/e2e/tests/oai/003.sh index 7eea0b0c..2c2575dd 100755 --- a/e2e/tests/oai/003.sh +++ b/e2e/tests/oai/003.sh @@ -57,7 +57,7 @@ metadata: name: oai-$nf spec: upstream: - repo: oai-packages + repo: oai-core-packages package: oai-$nf revision: r2 targets: @@ -81,7 +81,7 @@ for nf in nrf udm udr ausf amf smf; do k8s_wait_ready "packagevariant" "oai-$nf-core-oai-$nf" done for nf in nrf udm udr ausf amf smf; do - kpt_wait_pkg "core" "oai-$nf" "nephio" "900" + kpt_wait_pkg "core" "oai-$nf" "nephio" "1800" done kpt_wait_pkg "edge" "oai-upf"