Move e2e tests into a free5gc folder (#218)

Signed-off-by: Victor Morales <[email protected]>
nephio-project · Nov 28, 2023 · c30e955 · c30e955
1 parent 28a4c18
commit c30e955
Show file tree

Hide file tree

Showing 25 changed files with 51 additions and 50 deletions.
diff --git a/e2e/defaults.env 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
@@ -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
@@ -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
@@ -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
@@ -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 → e2e/tests/free5gc/001.sh b/e2e/tests/001.sh → 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 → e2e/tests/free5gc/002-edge-clusters.yaml b/e2e/tests/002-edge-clusters.yaml → e2e/tests/free5gc/002-edge-clusters.yaml
diff --git a/e2e/tests/002-network-topo.tmpl → e2e/tests/free5gc/002-network-topo.tmpl b/e2e/tests/002-network-topo.tmpl → e2e/tests/free5gc/002-network-topo.tmpl
diff --git a/e2e/tests/002-network.yaml → e2e/tests/free5gc/002-network.yaml b/e2e/tests/002-network.yaml → e2e/tests/free5gc/002-network.yaml
diff --git a/e2e/tests/002-secret.yaml → e2e/tests/free5gc/002-secret.yaml b/e2e/tests/002-secret.yaml → e2e/tests/free5gc/002-secret.yaml
diff --git a/e2e/tests/002-topo.gotmpl → e2e/tests/free5gc/002-topo.gotmpl b/e2e/tests/002-topo.gotmpl → e2e/tests/free5gc/002-topo.gotmpl
diff --git a/e2e/tests/002.sh → e2e/tests/free5gc/002.sh b/e2e/tests/002.sh → 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 → e2e/tests/free5gc/003.sh b/e2e/tests/003.sh → 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 → e2e/tests/free5gc/004-free5gc-operator.yaml b/e2e/tests/004-free5gc-operator.yaml → e2e/tests/free5gc/004-free5gc-operator.yaml
diff --git a/e2e/tests/004.sh → e2e/tests/free5gc/004.sh b/e2e/tests/004.sh → 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 → e2e/tests/free5gc/005-edge-free5gc-upf.yaml b/e2e/tests/005-edge-free5gc-upf.yaml → e2e/tests/free5gc/005-edge-free5gc-upf.yaml
diff --git a/e2e/tests/005.sh → e2e/tests/free5gc/005.sh b/e2e/tests/005.sh → 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 → ...sts/free5gc/006-regional-free5gc-amf.yaml b/e2e/tests/006-regional-free5gc-amf.yaml → ...sts/free5gc/006-regional-free5gc-amf.yaml
diff --git a/e2e/tests/006-regional-free5gc-smf.yaml → ...sts/free5gc/006-regional-free5gc-smf.yaml b/e2e/tests/006-regional-free5gc-smf.yaml → ...sts/free5gc/006-regional-free5gc-smf.yaml
diff --git a/e2e/tests/006.sh → e2e/tests/free5gc/006.sh b/e2e/tests/006.sh → 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 → e2e/tests/free5gc/007-edge01-ueransim.yaml b/e2e/tests/007-edge01-ueransim.yaml → e2e/tests/free5gc/007-edge01-ueransim.yaml
diff --git a/e2e/tests/007-subscriber.json → e2e/tests/free5gc/007-subscriber.json b/e2e/tests/007-subscriber.json → e2e/tests/free5gc/007-subscriber.json
diff --git a/e2e/tests/007.sh → e2e/tests/free5gc/007.sh b/e2e/tests/007.sh → 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 → e2e/tests/free5gc/008.sh b/e2e/tests/008.sh → 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> , 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 → e2e/tests/free5gc/009.sh b/e2e/tests/009.sh → 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, maxNFConnections> , 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"