Fixing openonu-go-test pipeline to support voltha-2.6 patches
Change-Id: I884d67cea104f03dcd76a308ad12684f71a7a211
diff --git a/jjb/pipeline/voltha-bbsim-tests.groovy b/jjb/pipeline/voltha-bbsim-tests.groovy
index 65f1eac..226b7e7 100644
--- a/jjb/pipeline/voltha-bbsim-tests.groovy
+++ b/jjb/pipeline/voltha-bbsim-tests.groovy
@@ -33,7 +33,7 @@
NAME="test"
VOLTCONFIG="$HOME/.volt/config-$NAME"
KUBECONFIG="$HOME/.kube/kind-config-voltha-$NAME"
- EXTRA_HELM_FLAGS=" --set global.image_registry=mirror.registry.opennetworking.org/ "
+ EXTRA_HELM_FLAGS=" --set global.image_registry=mirror.registry.opennetworking.org/ --set defaults.image_registry=mirror.registry.opennetworking.org/ "
}
stages {
diff --git a/jjb/pipeline/voltha-openonu-go-tests.groovy b/jjb/pipeline/voltha-openonu-go-tests.groovy
index 9adf4fe..27daa51 100755
--- a/jjb/pipeline/voltha-openonu-go-tests.groovy
+++ b/jjb/pipeline/voltha-openonu-go-tests.groovy
@@ -39,7 +39,7 @@
CONFIG_SADIS="external"
BBSIM_CFG="configs/bbsim-sadis-att.yaml"
ROBOT_MISC_ARGS="-d $WORKSPACE/RobotLogs"
- EXTRA_HELM_FLAGS=" --set global.image_registry=mirror.registry.opennetworking.org/ "
+ EXTRA_HELM_FLAGS=" --set global.image_registry=mirror.registry.opennetworking.org/ --set defaults.image_registry=mirror.registry.opennetworking.org/ "
}
stages {
stage('Clone kind-voltha') {
@@ -138,6 +138,14 @@
steps {
sh """
cd $WORKSPACE/kind-voltha/
+
+ if [ "${branch}" != "master" ]; then
+ echo "on branch: ${branch}, sourcing kind-voltha/releases/${branch}"
+ source "$WORKSPACE/kind-voltha/releases/${branch}"
+ else
+ echo "on master, using default settings for kind-voltha"
+ fi
+
JUST_K8S=y ./voltha up
bash <( curl -sfL https://raw.githubusercontent.com/boz/kail/master/godownloader.sh) -b "$WORKSPACE/kind-voltha/bin"
"""
@@ -156,13 +164,13 @@
steps {
sh '''
docker images | grep citest
- for image in \$(docker images -f "reference=*/*/*citest" --format "{{.Repository}}"); do echo "Pushing \$image to nodes"; kind load docker-image \$image:citest --name voltha-\$NAME --nodes voltha-\$NAME-worker,voltha-\$NAME-worker2; done
+ for image in \$(docker images -f "reference=*/*/*citest" --format "{{.Repository}}"); do echo "Pushing \$image to nodes"; kind load docker-image \$image:citest --name voltha-\$NAME --nodes voltha-\$NAME-control-plane,voltha-\$NAME-worker,voltha-\$NAME-worker2; done
'''
}
}
stage('Deploy Voltha') {
steps {
- sh '''
+ sh """
export EXTRA_HELM_FLAGS+="--set log_agent.enabled=False ${extraHelmFlags} "
IMAGES="adapter_open_onu_go"
@@ -175,8 +183,15 @@
cd $WORKSPACE/kind-voltha/
echo \$EXTRA_HELM_FLAGS
+ if [ "${branch}" != "master" ]; then
+ echo "on branch: ${branch}, sourcing kind-voltha/releases/${branch}"
+ source "$WORKSPACE/kind-voltha/releases/${branch}"
+ else
+ echo "on master, using default settings for kind-voltha"
+ fi
+
./voltha up
- '''
+ """
}
}
@@ -202,6 +217,13 @@
mkdir -p $WORKSPACE/1t8gem
_TAG=kail-1t8gem kail -n voltha -n default > $WORKSPACE/1t8gem/onos-voltha-combined.log &
+ if [ "${branch}" != "master" ]; then
+ echo "on branch: ${branch}, sourcing kind-voltha/releases/${branch}"
+ source "$WORKSPACE/kind-voltha/releases/${branch}"
+ else
+ echo "on master, using default settings for kind-voltha"
+ fi
+
DEPLOY_K8S=n ./voltha up
mkdir -p $ROBOT_LOGS_DIR/1t8gem
@@ -257,6 +279,13 @@
mkdir -p $WORKSPACE/dt
_TAG=kail-dt kail -n voltha -n default > $WORKSPACE/dt/onos-voltha-combined.log &
+ if [ "${branch}" != "master" ]; then
+ echo "on branch: ${branch}, sourcing kind-voltha/releases/${branch}"
+ source "$WORKSPACE/kind-voltha/releases/${branch}"
+ else
+ echo "on master, using default settings for kind-voltha"
+ fi
+
DEPLOY_K8S=n ./voltha up
mkdir -p $ROBOT_LOGS_DIR
@@ -327,6 +356,13 @@
mkdir -p $WORKSPACE/att
_TAG=kail-att kail -n voltha -n default > $WORKSPACE/att/onos-voltha-combined.log &
+ if [ "${branch}" != "master" ]; then
+ echo "on branch: ${branch}, sourcing kind-voltha/releases/${branch}"
+ source "$WORKSPACE/kind-voltha/releases/${branch}"
+ else
+ echo "on master, using default settings for kind-voltha"
+ fi
+
DEPLOY_K8S=n ./voltha up
mkdir -p $ROBOT_LOGS_DIR
@@ -391,6 +427,13 @@
mkdir -p $WORKSPACE/tt
_TAG=kail-tt kail -n voltha -n default > $WORKSPACE/tt/onos-voltha-combined.log &
+ if [ "${branch}" != "master" ]; then
+ echo "on branch: ${branch}, sourcing kind-voltha/releases/${branch}"
+ source "$WORKSPACE/kind-voltha/releases/${branch}"
+ else
+ echo "on master, using default settings for kind-voltha"
+ fi
+
DEPLOY_K8S=n ./voltha up
mkdir -p $ROBOT_LOGS_DIR
@@ -430,7 +473,7 @@
sh '''
set +e
# get pods information
- kubectl get pods -o wide
+ kubectl get pods -o wide --all-namespaces
kubectl get pods --all-namespaces -o jsonpath="{range .items[*].status.containerStatuses[*]}{.image}{'\\n'}"
helm ls