VOL-4926 - godownloader no longer available.
vars/createKubernetesCluster.groovy
vars/startComponentsLogs.groovy
jjb/pipeline/voltha/master/dmi-build-and-test.groovy
jjb/pipeline/voltha/master/voltha-dt-physical-functional-tests.groovy
jjb/pipeline/voltha/master/voltha-physical-functional-tests.groovy
jjb/pipeline/voltha/master/voltha-physical-soak-dt-tests.groovy
jjb/pipeline/voltha/master/voltha-tt-physical-functional-tests.groovy
jjb/pipeline/voltha/voltha-2.8/voltha-dt-physical-functional-tests.groovy
jjb/pipeline/voltha/voltha-2.8/voltha-physical-functional-tests.groovy
jjb/pipeline/voltha/voltha-2.8/voltha-physical-soak-dt-tests.groovy
jjb/pipeline/voltha/voltha-2.8/voltha-tt-physical-functional-tests.groovy
-------------------------------------------------------------------------
o Install kail using the makefile target defined in repo:voltha-system-tests.
o Update copyright notice to std format + 2023.
o Remove command existence logic, implcit test using make dependencies.
o Added whitespace between stage declarations and fixed some indentation
to improve readability.
Change-Id: Id04b89b4583fde1b2202bc5de07ef613713e5e7e
diff --git a/jjb/pipeline/voltha/master/dmi-build-and-test.groovy b/jjb/pipeline/voltha/master/dmi-build-and-test.groovy
index 926da46..6d66a53 100755
--- a/jjb/pipeline/voltha/master/dmi-build-and-test.groovy
+++ b/jjb/pipeline/voltha/master/dmi-build-and-test.groovy
@@ -1,4 +1,6 @@
-// Copyright 2022 Open Networking Foundation (ONF) and the ONF Contributors
+#!/usr/bin/env groovy
+// -----------------------------------------------------------------------
+// Copyright 2022-2023 Open Networking Foundation (ONF) and the ONF Contributors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -11,11 +13,12 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
-
-// used to deploy VOLTHA and configure ONOS physical PODs
-
+// -----------------------------------------------------------------------
+// Intent: used to deploy VOLTHA and configure ONOS physical PODs
+//
// NOTE we are importing the library even if it's global so that it's
// easier to change the keywords during a replay
+// -----------------------------------------------------------------------
library identifier: 'cord-jenkins-libraries@master',
retriever: modernSCM([
@@ -196,16 +199,14 @@
"""
}
}
- stage('Start logging') {
- steps {
- // check if kail is installed and if not installs it
- sh """
- if ! command -v kail &> /dev/null
- then
- bash <( curl -sfL https://raw.githubusercontent.com/boz/kail/master/godownloader.sh) -b "$WORKSPACE/bin"
- fi
- """
- sh returnStdout: false, script: '''
+ stage('Start logging')
+ {
+ steps
+ {
+ // Install kail
+ sh("""make -C "$WORKSPACE/voltha-system-tests" KAIL_PATH="$WORKSPACE/bin" kail""")
+
+ sh returnStdout: false, script: '''
# start logging with kail
cd $WORKSPACE
mkdir -p $LOG_FOLDER
@@ -216,9 +217,10 @@
_TAG=kail-$app kail -l app.kubernetes.io/name=$app --since 1h > $LOG_FOLDER/$app.log&
done
'''
- }
- }
- stage('Reinstall OLT software') {
+ }
+ }
+
+ stage('Reinstall OLT software') {
steps {
script {
if ( params.reinstallOlt ) {
diff --git a/jjb/pipeline/voltha/master/voltha-dt-physical-functional-tests.groovy b/jjb/pipeline/voltha/master/voltha-dt-physical-functional-tests.groovy
index 864ca3b..5a14eab 100644
--- a/jjb/pipeline/voltha/master/voltha-dt-physical-functional-tests.groovy
+++ b/jjb/pipeline/voltha/master/voltha-dt-physical-functional-tests.groovy
@@ -1,4 +1,6 @@
-// Copyright 2017-2022 Open Networking Foundation (ONF) and the ONF Contributors
+#!/usr/bin/env groovy
+// -----------------------------------------------------------------------
+// Copyright 2017-2023 Open Networking Foundation (ONF) and the ONF Contributors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -11,6 +13,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
+// -----------------------------------------------------------------------
library identifier: 'cord-jenkins-libraries@master',
retriever: modernSCM([
@@ -114,20 +117,20 @@
JENKINS_NODE_COOKIE="dontKillMe" _TAG="kafka" bash -c "while true; do kubectl port-forward --address 0.0.0.0 -n ${infraNamespace} svc/voltha-infra-kafka 9092:9092; done"&
ps aux | grep port-forward
"""
- sh """
- ps -ef | grep port-forward
- """
- sh returnStdout: false, script: """
- mkdir -p $WORKSPACE/bin
- # download kail
- bash <( curl -sfL https://raw.githubusercontent.com/boz/kail/master/godownloader.sh) -b "$WORKSPACE/bin"
+
+ sh("""ps -ef | grep port-forward""")
+
+ sh(returnStdout: false, script: """
+ mkdir -p "$WORKSPACE/bin"
+
+ # install kail
+ make -C "$WORKSPACE/voltha-system-tests" KAIL_PATH="$WORKSPACE/bin" kail
# Default kind-voltha config doesn't work on ONF demo pod for accessing kvstore.
# The issue is that the mgmt node is also one of the k8s nodes and so port forwarding doesn't work.
# We should change this. In the meantime here is a workaround.
set +e
-
# Remove noise from voltha-core logs
voltctl log level set WARN read-write-core#github.com/opencord/voltha-go/db/model
voltctl log level set WARN read-write-core#github.com/opencord/voltha-lib-go/v3/pkg/kafka
@@ -135,7 +138,7 @@
voltctl log level set WARN adapter-open-olt#github.com/opencord/voltha-lib-go/v3/pkg/db
voltctl log level set WARN adapter-open-olt#github.com/opencord/voltha-lib-go/v3/pkg/probe
voltctl log level set WARN adapter-open-olt#github.com/opencord/voltha-lib-go/v3/pkg/kafka
- """
+ """)
}
}
diff --git a/jjb/pipeline/voltha/master/voltha-physical-functional-tests.groovy b/jjb/pipeline/voltha/master/voltha-physical-functional-tests.groovy
index 1031cf9..8565148 100644
--- a/jjb/pipeline/voltha/master/voltha-physical-functional-tests.groovy
+++ b/jjb/pipeline/voltha/master/voltha-physical-functional-tests.groovy
@@ -1,4 +1,6 @@
-// Copyright 2017-2022 Open Networking Foundation (ONF) and the ONF Contributors
+#!/usr/bin/env groovy
+// -----------------------------------------------------------------------
+// Copyright 2017-2023 Open Networking Foundation (ONF) and the ONF Contributors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -11,6 +13,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
+// -----------------------------------------------------------------------
library identifier: 'cord-jenkins-libraries@master',
retriever: modernSCM([
@@ -95,11 +98,14 @@
script {
deployment_config = readYaml file: "${configBaseDir}/${configDeploymentDir}/${configFileName}.yaml"
}
- installVoltctl("${branch}")
- sh returnStdout: false, script: """
- mkdir -p $WORKSPACE/bin
- # download kail
- bash <( curl -sfL https://raw.githubusercontent.com/boz/kail/master/godownloader.sh) -b "$WORKSPACE/bin"
+ installVoltctl("${branch}")
+
+ sh(returnStdout: false, script: """
+
+ mkdir -p "$WORKSPACE/bin"
+
+ # install kail
+ make -C "$WORKSPACE/voltha-system-tests" KAIL_PATH="$WORKSPACE/bin" kail
if [ "${params.branch}" == "master" ]; then
# Default kind-voltha config doesn't work on ONF demo pod for accessing kvstore.
@@ -115,7 +121,7 @@
voltctl log level set WARN adapter-open-olt#github.com/opencord/voltha-lib-go/v3/pkg/probe
voltctl log level set WARN adapter-open-olt#github.com/opencord/voltha-lib-go/v3/pkg/kafka
fi
- """
+ """)
}
}
diff --git a/jjb/pipeline/voltha/master/voltha-physical-soak-dt-tests.groovy b/jjb/pipeline/voltha/master/voltha-physical-soak-dt-tests.groovy
index 5e655ce..6320cfb 100644
--- a/jjb/pipeline/voltha/master/voltha-physical-soak-dt-tests.groovy
+++ b/jjb/pipeline/voltha/master/voltha-physical-soak-dt-tests.groovy
@@ -1,4 +1,6 @@
-// Copyright 2017-2022 Open Networking Foundation (ONF) and the ONF Contributors
+#!/usr/bin/env groovy
+// -----------------------------------------------------------------------
+// Copyright 2017-2023 Open Networking Foundation (ONF) and the ONF Contributors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -11,6 +13,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
+// -----------------------------------------------------------------------
library identifier: 'cord-jenkins-libraries@master',
retriever: modernSCM([
@@ -101,10 +104,13 @@
deployment_config = readYaml file: "${configBaseDir}/${configDeploymentDir}/${configFileName}-DT.yaml"
}
installVoltctl("${branch}")
- sh returnStdout: false, script: """
- mkdir -p $WORKSPACE/bin
- # download kail
- bash <( curl -sfL https://raw.githubusercontent.com/boz/kail/master/godownloader.sh) -b "$WORKSPACE/bin"
+
+ sh(returnStdout: false, script: """
+
+ mkdir -p "$WORKSPACE/bin"
+
+ # install kail
+ make -C "$WORKSPACE/voltha-system-tests" KAIL_PATH="$WORKSPACE/bin" kail
if [ "${params.branch}" == "master" ]; then
# Default kind-voltha config doesn't work on ONF demo pod for accessing kvstore.
@@ -120,15 +126,16 @@
voltctl log level set WARN adapter-open-olt#github.com/opencord/voltha-lib-go/v3/pkg/probe
voltctl log level set WARN adapter-open-olt#github.com/opencord/voltha-lib-go/v3/pkg/kafka
fi
- """
- sh """
+ """)
+
+ sh("""
mkdir -p $WORKSPACE/voltha-pods-mem-consumption
cd $WORKSPACE/voltha-system-tests
make vst_venv
source ./vst_venv/bin/activate || true
# Collect initial memory consumption
python scripts/mem_consumption.py -o $WORKSPACE/voltha-pods-mem-consumption -a 0.0.0.0:31301 -n ${volthaNamespace} || true
- """
+ """)
}
}
@@ -247,3 +254,5 @@
}
}
}
+
+// [EOF]