From c30e955929b1184f01f9313102754d20e9096247 Mon Sep 17 00:00:00 2001 From: Victor Morales Date: Tue, 28 Nov 2023 08:42:57 -0800 Subject: [PATCH] Move e2e tests into a free5gc folder (#218) Signed-off-by: Victor Morales --- e2e/defaults.env | 13 +++++++++++++ e2e/e2e.sh | 8 +++++--- e2e/provision/hacks/inter-connect_workers.sh | 8 +++----- e2e/provision/hacks/network-topo.sh | 5 ++--- e2e/provision/hacks/vlan-interfaces.sh | 3 +++ e2e/tests/{ => free5gc}/001.sh | 6 ++---- e2e/tests/{ => free5gc}/002-edge-clusters.yaml | 0 e2e/tests/{ => free5gc}/002-network-topo.tmpl | 0 e2e/tests/{ => free5gc}/002-network.yaml | 0 e2e/tests/{ => free5gc}/002-secret.yaml | 0 e2e/tests/{ => free5gc}/002-topo.gotmpl | 0 e2e/tests/{ => free5gc}/002.sh | 6 ++---- e2e/tests/{ => free5gc}/003.sh | 6 ++---- e2e/tests/{ => free5gc}/004-free5gc-operator.yaml | 0 e2e/tests/{ => free5gc}/004.sh | 6 ++---- e2e/tests/{ => free5gc}/005-edge-free5gc-upf.yaml | 0 e2e/tests/{ => free5gc}/005.sh | 6 ++---- .../{ => free5gc}/006-regional-free5gc-amf.yaml | 0 .../{ => free5gc}/006-regional-free5gc-smf.yaml | 0 e2e/tests/{ => free5gc}/006.sh | 6 ++---- e2e/tests/{ => free5gc}/007-edge01-ueransim.yaml | 0 e2e/tests/{ => free5gc}/007-subscriber.json | 0 e2e/tests/{ => free5gc}/007.sh | 7 +++---- e2e/tests/{ => free5gc}/008.sh | 13 ++++++------- e2e/tests/{ => free5gc}/009.sh | 8 ++++---- 25 files changed, 51 insertions(+), 50 deletions(-) create mode 100755 e2e/defaults.env rename e2e/tests/{ => free5gc}/001.sh (95%) rename e2e/tests/{ => free5gc}/002-edge-clusters.yaml (100%) rename e2e/tests/{ => free5gc}/002-network-topo.tmpl (100%) rename e2e/tests/{ => free5gc}/002-network.yaml (100%) rename e2e/tests/{ => free5gc}/002-secret.yaml (100%) rename e2e/tests/{ => free5gc}/002-topo.gotmpl (100%) rename e2e/tests/{ => free5gc}/002.sh (92%) rename e2e/tests/{ => free5gc}/003.sh (92%) rename e2e/tests/{ => free5gc}/004-free5gc-operator.yaml (100%) rename e2e/tests/{ => free5gc}/004.sh (85%) rename e2e/tests/{ => free5gc}/005-edge-free5gc-upf.yaml (100%) rename e2e/tests/{ => free5gc}/005.sh (87%) rename e2e/tests/{ => free5gc}/006-regional-free5gc-amf.yaml (100%) rename e2e/tests/{ => free5gc}/006-regional-free5gc-smf.yaml (100%) rename e2e/tests/{ => free5gc}/006.sh (89%) rename e2e/tests/{ => free5gc}/007-edge01-ueransim.yaml (100%) rename e2e/tests/{ => free5gc}/007-subscriber.json (100%) rename e2e/tests/{ => free5gc}/007.sh (95%) rename e2e/tests/{ => free5gc}/008.sh (95%) rename e2e/tests/{ => free5gc}/009.sh (97%) diff --git a/e2e/defaults.env b/e2e/defaults.env new file mode 100755 index 00000000..2f0411da --- /dev/null +++ b/e2e/defaults.env @@ -0,0 +1,13 @@ +#!/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 +############################################################################## + +export HOME=${HOME:-/home/ubuntu/} +export TESTDIR=${TESTDIR:-$E2EDIR/tests/${E2ETYPE:-free5gc}} +export LIBDIR=${LIBDIR:-$E2EDIR/lib} diff --git a/e2e/e2e.sh b/e2e/e2e.sh index 681251d1..fd1226f2 100755 --- a/e2e/e2e.sh +++ b/e2e/e2e.sh @@ -13,11 +13,13 @@ set -o errexit set -o nounset [[ ${DEBUG:-false} != "true" ]] || set -o xtrace -export HOME=${HOME:-/home/ubuntu/} export E2EDIR=${E2EDIR:-$HOME/test-infra/e2e} -export TESTDIR=${TESTDIR:-$E2EDIR/tests} -source "$E2EDIR/lib/testing.sh" +# shellcheck source=e2e/defaults.env +source "$E2EDIR/defaults.env" + +# shellcheck source=e2e/lib/testing.sh +source "$LIBDIR/testing.sh" failed=$((0)) test_summary="" diff --git a/e2e/provision/hacks/inter-connect_workers.sh b/e2e/provision/hacks/inter-connect_workers.sh index 46bd8e9f..87fd8de8 100755 --- a/e2e/provision/hacks/inter-connect_workers.sh +++ b/e2e/provision/hacks/inter-connect_workers.sh @@ -15,17 +15,15 @@ set -o errexit set -o nounset [[ ${DEBUG:-false} != "true" ]] || set -o xtrace -export HOME=${HOME:-/home/ubuntu/} -export E2EDIR=${E2EDIR:-$HOME/test-infra/e2e} -export TESTDIR=${TESTDIR:-$E2EDIR/tests} -export LIBDIR=${LIBDIR:-$E2EDIR/lib} +# shellcheck source=e2e/defaults.env +source "$E2EDIR/defaults.env" # shellcheck source=e2e/lib/k8s.sh source "${LIBDIR}/k8s.sh" kubeconfig="$HOME/.kube/config" - workers="" + for cluster in $(kubectl get cl -o jsonpath='{range .items[*]}{.metadata.name}{"\n"}{end}' --sort-by=.metadata.name --kubeconfig "$kubeconfig"); do _kubeconfig=$(k8s_get_capi_kubeconfig "$cluster") workers+=$(kubectl get nodes -l node-role.kubernetes.io/control-plane!= -o jsonpath='{range .items[*]}"{.metadata.name}",{"\n"}{end}' --kubeconfig "$_kubeconfig") diff --git a/e2e/provision/hacks/network-topo.sh b/e2e/provision/hacks/network-topo.sh index 74cdd456..6a84e4eb 100755 --- a/e2e/provision/hacks/network-topo.sh +++ b/e2e/provision/hacks/network-topo.sh @@ -15,9 +15,8 @@ set -o errexit set -o nounset [[ ${DEBUG:-false} != "true" ]] || set -o xtrace -export HOME=${HOME:-/home/ubuntu/} -export E2EDIR=${E2EDIR:-$HOME/test-infra/e2e} -export TESTDIR=${TESTDIR:-$E2EDIR/tests} +# shellcheck source=e2e/defaults.env +source "$E2EDIR/defaults.env" export LEAF_IP=$(docker inspect net-free5gc-net-leaf -f '{{.NetworkSettings.Networks.kind.IPAddress}}') kubeconfig="$HOME/.kube/config" diff --git a/e2e/provision/hacks/vlan-interfaces.sh b/e2e/provision/hacks/vlan-interfaces.sh index 056af802..95db4a6d 100755 --- a/e2e/provision/hacks/vlan-interfaces.sh +++ b/e2e/provision/hacks/vlan-interfaces.sh @@ -15,6 +15,9 @@ set -o errexit set -o nounset [[ ${DEBUG:-false} != "true" ]] || set -o xtrace +# shellcheck source=e2e/defaults.env +source "$E2EDIR/defaults.env" + kubeconfig="$HOME/.kube/config" for worker in $(kubectl get machines -l cluster.x-k8s.io/control-plane!= -o jsonpath='{range .items[*]}{.metadata.name}{"\n"}{end}' --kubeconfig "$kubeconfig"); do diff --git a/e2e/tests/001.sh b/e2e/tests/free5gc/001.sh similarity index 95% rename from e2e/tests/001.sh rename to e2e/tests/free5gc/001.sh index c483ce29..a831005c 100755 --- a/e2e/tests/001.sh +++ b/e2e/tests/free5gc/001.sh @@ -17,10 +17,8 @@ set -o errexit set -o nounset [[ ${DEBUG:-false} != "true" ]] || set -o xtrace -export HOME=${HOME:-/home/ubuntu/} -export E2EDIR=${E2EDIR:-$HOME/test-infra/e2e} -export TESTDIR=${TESTDIR:-$E2EDIR/tests} -export LIBDIR=${LIBDIR:-$E2EDIR/lib} +# shellcheck source=e2e/defaults.env +source "$E2EDIR/defaults.env" # shellcheck source=e2e/lib/k8s.sh source "${LIBDIR}/k8s.sh" diff --git a/e2e/tests/002-edge-clusters.yaml b/e2e/tests/free5gc/002-edge-clusters.yaml similarity index 100% rename from e2e/tests/002-edge-clusters.yaml rename to e2e/tests/free5gc/002-edge-clusters.yaml diff --git a/e2e/tests/002-network-topo.tmpl b/e2e/tests/free5gc/002-network-topo.tmpl similarity index 100% rename from e2e/tests/002-network-topo.tmpl rename to e2e/tests/free5gc/002-network-topo.tmpl diff --git a/e2e/tests/002-network.yaml b/e2e/tests/free5gc/002-network.yaml similarity index 100% rename from e2e/tests/002-network.yaml rename to e2e/tests/free5gc/002-network.yaml diff --git a/e2e/tests/002-secret.yaml b/e2e/tests/free5gc/002-secret.yaml similarity index 100% rename from e2e/tests/002-secret.yaml rename to e2e/tests/free5gc/002-secret.yaml diff --git a/e2e/tests/002-topo.gotmpl b/e2e/tests/free5gc/002-topo.gotmpl similarity index 100% rename from e2e/tests/002-topo.gotmpl rename to e2e/tests/free5gc/002-topo.gotmpl diff --git a/e2e/tests/002.sh b/e2e/tests/free5gc/002.sh similarity index 92% rename from e2e/tests/002.sh rename to e2e/tests/free5gc/002.sh index 7a19a3f2..25e7d6af 100755 --- a/e2e/tests/002.sh +++ b/e2e/tests/free5gc/002.sh @@ -18,10 +18,8 @@ set -o errexit set -o nounset [[ ${DEBUG:-false} != "true" ]] || set -o xtrace -export HOME=${HOME:-/home/ubuntu/} -export E2EDIR=${E2EDIR:-$HOME/test-infra/e2e} -export TESTDIR=${TESTDIR:-$E2EDIR/tests} -export LIBDIR=${LIBDIR:-$E2EDIR/lib} +# shellcheck source=e2e/defaults.env +source "$E2EDIR/defaults.env" # shellcheck source=e2e/lib/k8s.sh source "${LIBDIR}/k8s.sh" diff --git a/e2e/tests/003.sh b/e2e/tests/free5gc/003.sh similarity index 92% rename from e2e/tests/003.sh rename to e2e/tests/free5gc/003.sh index bdd0c9e7..c3a7463d 100755 --- a/e2e/tests/003.sh +++ b/e2e/tests/free5gc/003.sh @@ -18,10 +18,8 @@ set -o errexit set -o nounset [[ ${DEBUG:-false} != "true" ]] || set -o xtrace -export HOME=${HOME:-/home/ubuntu/} -export E2EDIR=${E2EDIR:-$HOME/test-infra/e2e} -export TESTDIR=${TESTDIR:-$E2EDIR/tests} -export LIBDIR=${LIBDIR:-$E2EDIR/lib} +# shellcheck source=e2e/defaults.env +source "$E2EDIR/defaults.env" # shellcheck source=e2e/lib/k8s.sh source "${LIBDIR}/k8s.sh" diff --git a/e2e/tests/004-free5gc-operator.yaml b/e2e/tests/free5gc/004-free5gc-operator.yaml similarity index 100% rename from e2e/tests/004-free5gc-operator.yaml rename to e2e/tests/free5gc/004-free5gc-operator.yaml diff --git a/e2e/tests/004.sh b/e2e/tests/free5gc/004.sh similarity index 85% rename from e2e/tests/004.sh rename to e2e/tests/free5gc/004.sh index 367e9f11..80a5d7a1 100755 --- a/e2e/tests/004.sh +++ b/e2e/tests/free5gc/004.sh @@ -18,10 +18,8 @@ set -o errexit set -o nounset [[ ${DEBUG:-false} != "true" ]] || set -o xtrace -export HOME=${HOME:-/home/ubuntu/} -export E2EDIR=${E2EDIR:-$HOME/test-infra/e2e} -export TESTDIR=${TESTDIR:-$E2EDIR/tests} -export LIBDIR=${LIBDIR:-$E2EDIR/lib} +# shellcheck source=e2e/defaults.env +source "$E2EDIR/defaults.env" # shellcheck source=e2e/lib/k8s.sh source "${LIBDIR}/k8s.sh" diff --git a/e2e/tests/005-edge-free5gc-upf.yaml b/e2e/tests/free5gc/005-edge-free5gc-upf.yaml similarity index 100% rename from e2e/tests/005-edge-free5gc-upf.yaml rename to e2e/tests/free5gc/005-edge-free5gc-upf.yaml diff --git a/e2e/tests/005.sh b/e2e/tests/free5gc/005.sh similarity index 87% rename from e2e/tests/005.sh rename to e2e/tests/free5gc/005.sh index 4c584932..ca08014d 100755 --- a/e2e/tests/005.sh +++ b/e2e/tests/free5gc/005.sh @@ -18,10 +18,8 @@ set -o errexit set -o nounset [[ ${DEBUG:-false} != "true" ]] || set -o xtrace -export HOME=${HOME:-/home/ubuntu/} -export E2EDIR=${E2EDIR:-$HOME/test-infra/e2e} -export TESTDIR=${TESTDIR:-$E2EDIR/tests} -export LIBDIR=${LIBDIR:-$E2EDIR/lib} +# shellcheck source=e2e/defaults.env +source "$E2EDIR/defaults.env" # shellcheck source=e2e/lib/k8s.sh source "${LIBDIR}/k8s.sh" diff --git a/e2e/tests/006-regional-free5gc-amf.yaml b/e2e/tests/free5gc/006-regional-free5gc-amf.yaml similarity index 100% rename from e2e/tests/006-regional-free5gc-amf.yaml rename to e2e/tests/free5gc/006-regional-free5gc-amf.yaml diff --git a/e2e/tests/006-regional-free5gc-smf.yaml b/e2e/tests/free5gc/006-regional-free5gc-smf.yaml similarity index 100% rename from e2e/tests/006-regional-free5gc-smf.yaml rename to e2e/tests/free5gc/006-regional-free5gc-smf.yaml diff --git a/e2e/tests/006.sh b/e2e/tests/free5gc/006.sh similarity index 89% rename from e2e/tests/006.sh rename to e2e/tests/free5gc/006.sh index 0e4e8f54..97d015ec 100755 --- a/e2e/tests/006.sh +++ b/e2e/tests/free5gc/006.sh @@ -18,10 +18,8 @@ set -o errexit set -o nounset [[ ${DEBUG:-false} != "true" ]] || set -o xtrace -export HOME=${HOME:-/home/ubuntu/} -export E2EDIR=${E2EDIR:-$HOME/test-infra/e2e} -export TESTDIR=${TESTDIR:-$E2EDIR/tests} -export LIBDIR=${LIBDIR:-$E2EDIR/lib} +# shellcheck source=e2e/defaults.env +source "$E2EDIR/defaults.env" # shellcheck source=e2e/lib/k8s.sh source "${LIBDIR}/k8s.sh" diff --git a/e2e/tests/007-edge01-ueransim.yaml b/e2e/tests/free5gc/007-edge01-ueransim.yaml similarity index 100% rename from e2e/tests/007-edge01-ueransim.yaml rename to e2e/tests/free5gc/007-edge01-ueransim.yaml diff --git a/e2e/tests/007-subscriber.json b/e2e/tests/free5gc/007-subscriber.json similarity index 100% rename from e2e/tests/007-subscriber.json rename to e2e/tests/free5gc/007-subscriber.json diff --git a/e2e/tests/007.sh b/e2e/tests/free5gc/007.sh similarity index 95% rename from e2e/tests/007.sh rename to e2e/tests/free5gc/007.sh index c9d9902a..d0ddeab7 100755 --- a/e2e/tests/007.sh +++ b/e2e/tests/free5gc/007.sh @@ -18,13 +18,12 @@ set -o errexit set -o nounset [[ ${DEBUG:-false} != "true" ]] || set -o xtrace -export HOME=${HOME:-/home/ubuntu/} -export E2EDIR=${E2EDIR:-$HOME/test-infra/e2e} -export TESTDIR=${TESTDIR:-$E2EDIR/tests} -export LIBDIR=${LIBDIR:-$E2EDIR/lib} +# shellcheck source=e2e/defaults.env +source "$E2EDIR/defaults.env" # shellcheck source=e2e/lib/_utils.sh source "${LIBDIR}/_utils.sh" + # shellcheck source=e2e/lib/k8s.sh source "${LIBDIR}/k8s.sh" diff --git a/e2e/tests/008.sh b/e2e/tests/free5gc/008.sh similarity index 95% rename from e2e/tests/008.sh rename to e2e/tests/free5gc/008.sh index 8856ba3e..c30f29d9 100755 --- a/e2e/tests/008.sh +++ b/e2e/tests/free5gc/008.sh @@ -8,6 +8,7 @@ # which accompanies this distribution, and is available at # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## + ## TEST METADATA ## TEST-NAME: Vertically Scale free5gc UPF in Edge Clusters ## Usage : 008.sh , Capacity > 5G @@ -17,20 +18,18 @@ set -o errexit set -o nounset [[ ${DEBUG:-false} != "true" ]] || set -o xtrace -# Set the new value for maxUplinkThroughput as a parameter -new_capacity_value=${1:-20G} - -export HOME=${HOME:-/home/ubuntu/} -export E2EDIR=${E2EDIR:-$HOME/test-infra/e2e} -export TESTDIR=${TESTDIR:-$E2EDIR/tests} -export LIBDIR=${LIBDIR:-$E2EDIR/lib} +# shellcheck source=e2e/defaults.env +source "$E2EDIR/defaults.env" # shellcheck source=e2e/lib/_utils.sh source "${LIBDIR}/_utils.sh" + # shellcheck source=e2e/lib/k8s.sh source "${LIBDIR}/k8s.sh" kubeconfig="$HOME/.kube/config" +# Set the new value for maxUplinkThroughput as a parameter +new_capacity_value=${1:-20G} #Get the cluster kubeconfig info "Getting kubeconfig for edge01" diff --git a/e2e/tests/009.sh b/e2e/tests/free5gc/009.sh similarity index 97% rename from e2e/tests/009.sh rename to e2e/tests/free5gc/009.sh index 3d255dc8..fc4646cb 100755 --- a/e2e/tests/009.sh +++ b/e2e/tests/free5gc/009.sh @@ -8,6 +8,7 @@ # which accompanies this distribution, and is available at # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## + ## TEST METADATA ## TEST-NAME: Vertically Scale free5gc SMF in Regional Clusters ## Usage : 009.sh , maxSessions > 2000, maxNFConnections > 20 @@ -17,13 +18,12 @@ set -o errexit set -o nounset [[ ${DEBUG:-false} != "true" ]] || set -o xtrace -export HOME=${HOME:-/home/ubuntu/} -export E2EDIR=${E2EDIR:-$HOME/test-infra/e2e} -export TESTDIR=${TESTDIR:-$E2EDIR/tests} -export LIBDIR=${LIBDIR:-$E2EDIR/lib} +# shellcheck source=e2e/defaults.env +source "$E2EDIR/defaults.env" # shellcheck source=e2e/lib/_utils.sh source "${LIBDIR}/_utils.sh" + # shellcheck source=e2e/lib/k8s.sh source "${LIBDIR}/k8s.sh"