diff --git a/e2e/launch.sh b/e2e/launch.sh index 9c48500a..4de9a101 100755 --- a/e2e/launch.sh +++ b/e2e/launch.sh @@ -46,4 +46,5 @@ if [[ "$ORGNAME" == "google.com" ]]; then OPTS="-o ProxyCommand='corp-ssh-helper %h %p'" fi +trap "echo To ssh to the VM: gcloud compute ssh $VM -- $OPTS" INT echo gcloud compute ssh $VM -- $OPTS sudo journalctl -u google-startup-scripts.service --follow | /bin/bash diff --git a/e2e/provision/bash_config.sh b/e2e/provision/bash_config.sh new file mode 100755 index 00000000..87cdc79b --- /dev/null +++ b/e2e/provision/bash_config.sh @@ -0,0 +1,25 @@ +#!/usr/bin/env bash +# 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 +############################################################################## + +# This file contains conveniences for the user on the test machine. It will be +# copied to the .bash_aliases file for that user. + +alias k=kubectl + +function get_capi_kubeconfig { + local cluster=$1 + + if [[ -z "$cluster" ]]; then + echo "Usage: $0 cluster-name" + return 1 + fi + + kubectl get secret "${cluster}-kubeconfig" -o jsonpath='{.data.value}' | base64 -d > "${cluster}-kubeconfig" +} diff --git a/e2e/provision/gce_init.sh b/e2e/provision/gce_init.sh index a557f664..fbd3d9e1 100755 --- a/e2e/provision/gce_init.sh +++ b/e2e/provision/gce_init.sh @@ -37,17 +37,15 @@ apt-get install -y git cd /home/$NEPHIO_USER -cat > .bash_aliases < /home/$NEPHIO_USER/nephio.yaml cd ./test-infra/e2e/provision export DEBUG DEPLOYMENT_TYPE diff --git a/e2e/provision/playbooks/roles/install/tasks/main.yml b/e2e/provision/playbooks/roles/install/tasks/main.yml index 0b79fcdc..1e61f3be 100644 --- a/e2e/provision/playbooks/roles/install/tasks/main.yml +++ b/e2e/provision/playbooks/roles/install/tasks/main.yml @@ -13,7 +13,7 @@ name: kpt loop: - {pkg: porch-dev, version: porch-dev/v2, namespaces: [porch-fn-system, porch-system]} - - {pkg: nephio-controllers, version: nephio-controllers/v4, namespaces: [nephio-system]} + - {pkg: nephio-controllers, version: nephio-controllers/v5, namespaces: [nephio-system]} - {pkg: configsync, version: configsync/v1, namespaces: [config-management-monitoring, config-management-system, resource-group-system]} - {pkg: nephio-stock-repos, version: nephio-stock-repos/v1, namespaces: []} vars: diff --git a/e2e/tests/001.sh b/e2e/tests/001.sh index d704537b..b08f82fd 100644 --- a/e2e/tests/001.sh +++ b/e2e/tests/001.sh @@ -26,7 +26,7 @@ source "${LIBDIR}/k8s.sh" kubeconfig="$HOME/.kube/config" -workload_cluster_pkg_rev=$(kpt alpha rpkg get --name nephio-workload-cluster --revision v7 -o jsonpath='{.metadata.name}') +workload_cluster_pkg_rev=$(kpt alpha rpkg get --name nephio-workload-cluster --revision v8 -o jsonpath='{.metadata.name}') regional_pkg_rev=$(kpt alpha rpkg clone -n default "$workload_cluster_pkg_rev" --repository mgmt regional | cut -f 1 -d ' ') kpt alpha rpkg pull -n default "$regional_pkg_rev" regional @@ -37,5 +37,6 @@ kpt alpha rpkg propose -n default "$regional_pkg_rev" kpt alpha rpkg approve -n default "$regional_pkg_rev" k8s_wait_exists "$kubeconfig" 600 "default" "workloadcluster" "regional" - +k8s_wait_exists "$kubeconfig" 600 "default" "cluster" "regional" k8s_wait_ready "$kubeconfig" 600 "default" "cluster" "regional" + diff --git a/e2e/tests/002-edge-clusters.yaml b/e2e/tests/002-edge-clusters.yaml index 71334ac3..52db401e 100644 --- a/e2e/tests/002-edge-clusters.yaml +++ b/e2e/tests/002-edge-clusters.yaml @@ -6,7 +6,7 @@ spec: upstream: repo: nephio-example-packages package: nephio-workload-cluster - revision: v7 + revision: v8 targets: - repositories: - name: mgmt diff --git a/e2e/tests/002.sh b/e2e/tests/002.sh index 0f1ae246..9aa2ff1a 100644 --- a/e2e/tests/002.sh +++ b/e2e/tests/002.sh @@ -32,5 +32,8 @@ k8s_apply "$kubeconfig" "$TESTDIR/002-edge-clusters.yaml" k8s_wait_exists "$kubeconfig" 600 "default" "workloadcluster" "edge01" k8s_wait_exists "$kubeconfig" 600 "default" "workloadcluster" "edge02" +k8s_wait_exists "$kubeconfig" 600 "default" "cluster" "edge01" +k8s_wait_exists "$kubeconfig" 600 "default" "cluster" "edge02" + k8s_wait_ready "$kubeconfig" 600 "default" "cluster" "edge01" k8s_wait_ready "$kubeconfig" 600 "default" "cluster" "edge02" diff --git a/e2e/tests/004.sh b/e2e/tests/004.sh index 387089da..9e27417e 100644 --- a/e2e/tests/004.sh +++ b/e2e/tests/004.sh @@ -30,7 +30,7 @@ kubeconfig="$HOME/.kube/config" k8s_apply "$kubeconfig" "$TESTDIR/004-free5gc-operator.yaml" for cluster in "regional" "edge01" "edge02"; do - cluster_kubeconfig=$(k8s_get_capi_kubeconfig "$kubeconfig" "default" "regional") + cluster_kubeconfig=$(k8s_get_capi_kubeconfig "$kubeconfig" "default" "$cluster") k8s_wait_exists "$cluster_kubeconfig" 600 "free5gc" "deployment" "free5gc-operator-controller" k8s_wait_ready_replicas "$cluster_kubeconfig" 600 "free5gc" "deployment" "free5gc-operator-controller" done diff --git a/e2e/tests/005.sh b/e2e/tests/005.sh index 80e21fdd..b49d57c9 100644 --- a/e2e/tests/005.sh +++ b/e2e/tests/005.sh @@ -27,19 +27,20 @@ source "${LIBDIR}/k8s.sh" kubeconfig="$HOME/.kube/config" +# apply both AMF and SMF so they both start processing k8s_apply "$kubeconfig" "$TESTDIR/005-regional-free5gc-amf.yaml" k8s_apply "$kubeconfig" "$TESTDIR/005-regional-free5gc-smf.yaml" -k8s_wait_exists "$kubeconfig" 600 "default" "packagevariant" "regional-free5gc-amf-regional-free5gc-amf" -k8s_wait_exists "$kubeconfig" 600 "default" "packagevariant" "regional-free5gc-smf-regional-free5gc-smf" - -k8s_wait_ready "$kubeconfig" 600 "default" "packagevariant" "regional-free5gc-amf-regional-free5gc-amf" -k8s_wait_ready "$kubeconfig" 600 "default" "packagevariant" "regional-free5gc-smf-regional-free5gc-smf" - cluster_kubeconfig=$(k8s_get_capi_kubeconfig "$kubeconfig" "default" "regional") +# check the AMF +k8s_wait_exists "$kubeconfig" 600 "default" "packagevariant" "regional-free5gc-amf-regional-free5gc-amf" +k8s_wait_ready "$kubeconfig" 600 "default" "packagevariant" "regional-free5gc-amf-regional-free5gc-amf" k8s_wait_exists "$cluster_kubeconfig" 600 "free5gc-amf" "deployment" "free5gc-amf" -k8s_wait_exists "$cluster_kubeconfig" 600 "free5gc-amf" "deployment" "free5gc-smf" - k8s_wait_ready_replicas "$cluster_kubeconfig" 600 "free5gc" "deployment" "free5gc-amf" + +# check the SMF +k8s_wait_ready "$kubeconfig" 600 "default" "packagevariant" "regional-free5gc-smf-regional-free5gc-smf" +k8s_wait_exists "$kubeconfig" 600 "default" "packagevariant" "regional-free5gc-smf-regional-free5gc-smf" +k8s_wait_exists "$cluster_kubeconfig" 600 "free5gc-amf" "deployment" "free5gc-smf" k8s_wait_ready_replicas "$cluster_kubeconfig" 600 "free5gc" "deployment" "free5gc-smf" diff --git a/e2e/tests/006.sh b/e2e/tests/006.sh index ec03a625..6a92fe64 100644 --- a/e2e/tests/006.sh +++ b/e2e/tests/006.sh @@ -38,7 +38,7 @@ for cluster in "edge01" "edge02"; do done for cluster in "edge01" "edge02"; do - cluster_kubeconfig=$(k8s_get_capi_kubeconfig "$kubeconfig" "default" "regional") + cluster_kubeconfig=$(k8s_get_capi_kubeconfig "$kubeconfig" "default" "$cluster") k8s_wait_exists "$cluster_kubeconfig" 600 "free5gc-upf" "deployment" "free5gc-upf" k8s_wait_ready_replicas "$cluster_kubeconfig" 600 "free5gc-upf" "deployment" "free5gc-upf" done