Merge "Trigger OMEC docker-publish jobs on Github PR merge"
diff --git a/jjb/charts.yaml b/jjb/charts.yaml
index 1c46a78..b359dd6 100644
--- a/jjb/charts.yaml
+++ b/jjb/charts.yaml
@@ -69,7 +69,7 @@
# Setup helm and external repos
helm init --client-only
helm repo add incubator https://kubernetes-charts-incubator.storage.googleapis.com
- helm repo add rook-beta https://charts.rook.io/beta
+ helm repo add rook-release https://charts.rook.io/release
helm repo add cord https://charts.opencord.org
# Update the repo
@@ -164,7 +164,7 @@
# Setup helm and external repos
helm init --client-only
helm repo add incubator https://kubernetes-charts-incubator.storage.googleapis.com
- helm repo add rook-beta https://charts.rook.io/beta
+ helm repo add rook-release https://charts.rook.io/release
helm repo add cord https://charts.opencord.org
git clone https://gerrit.opencord.org/helm-repo-tools
diff --git a/jjb/cord-test/nightly-build-pipeline.yaml b/jjb/cord-test/nightly-build-pipeline.yaml
index 354f92f..eaf06bf 100644
--- a/jjb/cord-test/nightly-build-pipeline.yaml
+++ b/jjb/cord-test/nightly-build-pipeline.yaml
@@ -917,6 +917,10 @@
default: '{onos-version}'
description: 'ONOS version that needs to be configured'
+ - string:
+ name: workFlow
+ default: '{work-flow}'
+ description: 'Installs the specified work flow on the POD'
- bool:
name: released
@@ -938,11 +942,6 @@
default: '{with-kind}'
description: "The pods uses kind and a physical fabric thus port forward to the management is needed"
- - bool:
- name: ofagentGo
- default: '{use-ofagent-go}'
- description: "Installs POD with go version when true"
-
concurrent: true
pipeline-scm:
diff --git a/jjb/cord-test/voltha.yaml b/jjb/cord-test/voltha.yaml
index ff904d4..b0cde41 100644
--- a/jjb/cord-test/voltha.yaml
+++ b/jjb/cord-test/voltha.yaml
@@ -9,9 +9,9 @@
build-timeout: '300'
with-kind: false
- use-ofagent-go: false
onos-version: '2.2'
power-switch: False
+ work-flow: ''
jobs:
# flex OCP pod with olt/onu - manual test job, voltha master build job
@@ -128,34 +128,6 @@
test-repo: 'voltha-system-tests'
profile: '1T4GEM-bal31'
- # flex OCP pod with olt/onu - OFAGENT GO job, uses 1TCONT/4GEMs tech profile on voltha - timer based job
- - 'build_voltha_pod_release':
- build-node: 'qa-testvm-pod'
- config-pod: 'flex-ocp-cord'
- release: 'master'
- branch: 'master'
- released: false
- name-extension: '_GO'
- use-ofagent-go: true
- test-repo: 'voltha-system-tests'
- Jenkinsfile: 'Jenkinsfile-voltha-bal31-build'
- oltDebVersion: 'openolt-2.3.0.deb'
- configurePod: true
- profile: '1T4GEM-bal31'
- time: '6'
-
- # flex pod1 test job - OFAGENT GO job, test job uses 1TCONT/4GEMs tech profile - using voltha branch
- - 'build_voltha_pod_test':
- build-node: 'qa-testvm-pod'
- config-pod: 'flex-ocp-cord'
- release: 'master'
- branch: 'master'
- name-extension: '_GO'
- released: false
- power-switch: True
- test-repo: 'voltha-system-tests'
- profile: '1T4GEM-bal31'
-
# Menlo pod with olt/onu - Default tech profile and timer based job
- 'build_voltha_pod_release':
build-node: 'menlo-demo-pod'
@@ -234,14 +206,14 @@
config-pod: 'onf-demo-pod'
release: 'master'
branch: 'master'
- name-extension: '_GO'
- use-ofagent-go: true
+ name-extension: '_DT'
+ work-flow: 'DT'
released: false
test-repo: 'voltha-system-tests'
Jenkinsfile: 'Jenkinsfile-voltha-bal31-build'
oltDebVersion: 'openolt-2.3.0.deb'
configurePod: true
- profile: 'Default'
+ profile: '1T8GEM'
time: '6'
# Menlo pod test job - uses tech profile on voltha branch
@@ -250,37 +222,11 @@
config-pod: 'onf-demo-pod'
release: 'master'
branch: 'master'
- name-extension: '_GO'
+ name-extension: '_DT'
released: false
test-repo: 'voltha-system-tests'
- profile: 'Default'
-
- # Menlo pod with olt/onu - Uses GO Version - Default tech profile and timer based job
- - 'build_voltha_pod_release':
- build-node: 'menlo-demo-pod'
- config-pod: 'onf-demo-pod'
- release: 'master'
- branch: 'master'
- name-extension: '_GO'
- use-ofagent-go: true
- released: false
- test-repo: 'voltha-system-tests'
- Jenkinsfile: 'Jenkinsfile-voltha-bal31-build'
- oltDebVersion: 'openolt-2.3.0.deb'
- configurePod: true
- profile: '1T4GEM-bal31'
- time: '8'
-
- # Menlo pod test job - uses tech profile on voltha branch
- - 'build_voltha_pod_test':
- build-node: 'menlo-demo-pod'
- config-pod: 'onf-demo-pod'
- release: 'master'
- branch: 'master'
- name-extension: '_GO'
- released: false
- test-repo: 'voltha-system-tests'
- profile: '1T4GEM-bal31'
+ profile: '1T8GEM'
+ pipeline-script: 'voltha-dt-physical-functional-tests.groovy'
# Menlo DEMO-POD - 1 1TCONT 4 4GEMs TechProfile - Manual build and test job
- 'build_pod_manual':
@@ -356,7 +302,7 @@
onos-version: '2.2'
test-repo: 'voltha-system-tests'
Jenkinsfile: 'Jenkinsfile-voltha-bal31-build'
- oltDebVersion: 'openolt_asfvolt16_bal3.2.deb'
+ oltDebVersion: 'openolt-2.3.0.deb'
configurePod: true
released: false
profile: 'Default'
diff --git a/jjb/pipeline/omec-fossa-scan.groovy b/jjb/pipeline/omec-fossa-scan.groovy
index f59f276..613b03e 100644
--- a/jjb/pipeline/omec-fossa-scan.groovy
+++ b/jjb/pipeline/omec-fossa-scan.groovy
@@ -40,7 +40,8 @@
steps {
checkout([
$class: 'GitSCM',
- userRemoteConfigs: [[ url: "https://github.com/${params.ghprbGhRepository}", refspec: "+refs/pull/${params.ghprbPullId}/merge" ]],
+ userRemoteConfigs: [[ url: "https://github.com/${params.ghprbGhRepository}", refspec: "pull/${params.ghprbPullId}/head" ]],
+ extensions: [[$class: 'RelativeTargetDirectory', relativeTargetDir: "${params.project}"]],
],
)
}
@@ -52,6 +53,7 @@
sh """
#!/usr/bin/env bash
+ cd ${params.project}
git checkout FETCH_HEAD
git show
diff --git a/jjb/pipeline/omec-reuse-scan.groovy b/jjb/pipeline/omec-reuse-scan.groovy
index f4fcf51..6b471ab 100644
--- a/jjb/pipeline/omec-reuse-scan.groovy
+++ b/jjb/pipeline/omec-reuse-scan.groovy
@@ -40,7 +40,8 @@
steps {
checkout([
$class: 'GitSCM',
- userRemoteConfigs: [[ url: "https://github.com/${params.ghprbGhRepository}", refspec: "+refs/pull/${params.ghprbPullId}/merge" ]],
+ userRemoteConfigs: [[ url: "https://github.com/${params.ghprbGhRepository}", refspec: "pull/${params.ghprbPullId}/head" ]],
+ extensions: [[$class: 'RelativeTargetDirectory', relativeTargetDir: "${params.project}"]],
],
)
}
@@ -51,9 +52,15 @@
sh """
#!/usr/bin/env bash
+ cd ${params.project}
git checkout FETCH_HEAD
git show
+ mkdir ../jenkins-license-scan
+ cp --parents $(git diff-tree --no-commit-id --name-only -r HEAD) ../jenkins-license-scan
+ cd ../jenkins-license-scan
+
+ reuse download --all
reuse lint
"""
}
diff --git a/jjb/pipeline/voltha-bbsim-tests.groovy b/jjb/pipeline/voltha-bbsim-tests.groovy
index 6363770..a64d6ef 100644
--- a/jjb/pipeline/voltha-bbsim-tests.groovy
+++ b/jjb/pipeline/voltha-bbsim-tests.groovy
@@ -135,7 +135,10 @@
if [ "${gerritProject}" = "voltha-go" ]; then
IMAGES="rw_core ro_core "
elif [ "${gerritProject}" = "ofagent-py" ]; then
- IMAGES="ofagent "
+ IMAGES="ofagent_py "
+ EXTRA_HELM_FLAGS+="--set use_ofagent_go=false "
+ elif [ "${gerritProject}" = "ofagent-go" ]; then
+ IMAGES="ofagent_go "
elif [ "${gerritProject}" = "voltha-onos" ]; then
IMAGES="onos "
elif [ "${gerritProject}" = "voltha-openolt-adapter" ]; then
diff --git a/jjb/pipeline/voltha-dt-physical-functional-tests.groovy b/jjb/pipeline/voltha-dt-physical-functional-tests.groovy
new file mode 100644
index 0000000..98f4edb
--- /dev/null
+++ b/jjb/pipeline/voltha-dt-physical-functional-tests.groovy
@@ -0,0 +1,165 @@
+// Copyright 2017-present Open Networking Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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.
+
+node {
+ // Need this so that deployment_config has global scope when it's read later
+ deployment_config = null
+}
+
+pipeline {
+ /* no label, executor is determined by JJB */
+ agent {
+ label "${params.buildNode}"
+ }
+ options {
+ timeout(time: 90, unit: 'MINUTES')
+ }
+
+ environment {
+ KUBECONFIG="$WORKSPACE/${configBaseDir}/${configKubernetesDir}/${configFileName}.conf"
+ VOLTCONFIG="$HOME/.volt/config-minimal"
+ PATH="$WORKSPACE/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+ }
+
+ stages {
+ stage ('Initialize') {
+ steps {
+ step([$class: 'WsCleanup'])
+ sh returnStdout: false, script: "git clone -b ${branch} ${cordRepoUrl}/${configBaseDir}"
+ script {
+ deployment_config = readYaml file: "${configBaseDir}/${configDeploymentDir}/${configFileName}-DT.yaml"
+ }
+ // This checkout is just so that we can show changes in Jenkins
+ checkout(changelog: true,
+ poll: false,
+ scm: [$class: 'RepoScm',
+ manifestRepositoryUrl: "${params.manifestUrl}",
+ manifestBranch: "${params.manifestBranch}",
+ currentBranch: true,
+ destinationDir: 'voltha',
+ forceSync: true,
+ resetFirst: true,
+ quiet: true,
+ jobs: 4,
+ showAllChanges: true]
+ )
+ sh returnStdout: false, script: """
+ cd voltha
+ git clone -b ${branch} ${cordRepoUrl}/cord-tester
+ mkdir -p $WORKSPACE/bin
+ bash <( curl -sfL https://raw.githubusercontent.com/boz/kail/master/godownloader.sh) -b "$WORKSPACE/bin"
+ cd $WORKSPACE
+ git clone https://github.com/ciena/kind-voltha.git
+
+ VC_VERSION=\$(curl -sSL https://api.github.com/repos/opencord/voltctl/releases/latest | jq -r .tag_name | sed -e 's/^v//g')
+ HOSTOS=\$(uname -s | tr "[:upper:]" "[:lower:"])
+ HOSTARCH=\$(uname -m | tr "[:upper:]" "[:lower:"])
+ if [ \$HOSTARCH == "x86_64" ]; then
+ HOSTARCH="amd64"
+ fi
+ curl -o $WORKSPACE/bin/voltctl -sSL https://github.com/opencord/voltctl/releases/download/v\${VC_VERSION}/voltctl-\${VC_VERSION}-\${HOSTOS}-\${HOSTARCH}
+ chmod 755 $WORKSPACE/bin/voltctl
+ voltctl version --clientonly
+ """
+ }
+ }
+
+ stage('Functional Tests') {
+ environment {
+ ROBOT_CONFIG_FILE="$WORKSPACE/${configBaseDir}/${configDeploymentDir}/${configFileName}-DT.yaml"
+ ROBOT_FILE="Voltha_DT_PODTests.robot"
+ ROBOT_LOGS_DIR="$WORKSPACE/RobotLogs/dt-workflow"
+ }
+ steps {
+ sh """
+ cd $WORKSPACE/kind-voltha/scripts
+ ./log-collector.sh > /dev/null &
+ ./log-combine.sh > /dev/null &
+
+ mkdir -p $ROBOT_LOGS_DIR
+ if ( ${released} ); then
+ export ROBOT_MISC_ARGS="--removekeywords wuks -i released -i sanityDt -e bbsim -e notready -d $ROBOT_LOGS_DIR -v POD_NAME:${configFileName} -v KUBERNETES_CONFIGS_DIR:$WORKSPACE/${configBaseDir}/${configKubernetesDir} -v container_log_dir:$WORKSPACE"
+ else
+ export ROBOT_MISC_ARGS="--removekeywords wuks -i sanityDt -i functionalDt -e bbsim -e notready -d $ROBOT_LOGS_DIR -v POD_NAME:${configFileName} -v KUBERNETES_CONFIGS_DIR:$WORKSPACE/${configBaseDir}/${configKubernetesDir} -v container_log_dir:$WORKSPACE"
+ fi
+ make -C $WORKSPACE/voltha/voltha-system-tests voltha-dt-test || true
+ """
+ }
+ }
+ }
+ post {
+ always {
+ sh returnStdout: false, script: '''
+ set +e
+ kubectl get pods --all-namespaces -o jsonpath="{range .items[*].status.containerStatuses[*]}{.image}{'\\t'}{.imageID}{'\\n'}" | sort | uniq -c
+ kubectl get nodes -o wide
+ kubectl get pods -n voltha -o wide
+
+ sleep 60 # Wait for log-collector and log-combine to complete
+
+ # Clean up "announcer" pod used by the tests if present
+ kubectl delete pod announcer || true
+
+ ## Pull out errors from log files
+ extract_errors_go() {
+ echo
+ echo "Error summary for $1:"
+ grep '"level":"error"' $WORKSPACE/kind-voltha/scripts/logger/combined/$1*
+ echo
+ }
+
+ extract_errors_python() {
+ echo
+ echo "Error summary for $1:"
+ grep 'ERROR' $WORKSPACE/kind-voltha/scripts/logger/combined/$1*
+ echo
+ }
+
+ extract_errors_go voltha-rw-core > $WORKSPACE/error-report.log
+ extract_errors_go adapter-open-olt >> $WORKSPACE/error-report.log
+ extract_errors_python adapter-open-onu >> $WORKSPACE/error-report.log
+ extract_errors_python voltha-ofagent >> $WORKSPACE/error-report.log
+ extract_errors_python onos >> $WORKSPACE/error-report.log
+
+ cd $WORKSPACE/kind-voltha/scripts/logger/combined/
+ tar czf $WORKSPACE/container-logs.tgz *
+
+ cd $WORKSPACE
+ gzip *-combined.log || true
+ '''
+ script {
+ deployment_config.olts.each { olt ->
+ sh returnStdout: false, script: """
+ sshpass -p ${olt.pass} scp ${olt.user}@${olt.ip}:/var/log/openolt.log $WORKSPACE/openolt-${olt.ip}.log || true
+ sed -i 's/\\x1b\\[[0-9;]*[a-zA-Z]//g' $WORKSPACE/openolt-${olt.ip}.log # Remove escape sequences
+ """
+ }
+ }
+ step([$class: 'RobotPublisher',
+ disableArchiveOutput: false,
+ logFileName: '**/log*.html',
+ otherFiles: '',
+ outputFileName: '**/output*.xml',
+ outputPath: 'RobotLogs',
+ passThreshold: 100,
+ reportFileName: '**/report*.html',
+ unstableThreshold: 0
+ ]);
+ archiveArtifacts artifacts: '*.log,*.gz,*.tgz'
+ }
+ unstable {
+ step([$class: 'Mailer', notifyEveryUnstableBuild: true, recipients: "${notificationEmail}", sendToIndividuals: false])
+ }
+ }
+}
diff --git a/jjb/pipeline/voltha-go-multi-tests.groovy b/jjb/pipeline/voltha-go-multi-tests.groovy
index c8886ff..4d0fde1 100644
--- a/jjb/pipeline/voltha-go-multi-tests.groovy
+++ b/jjb/pipeline/voltha-go-multi-tests.groovy
@@ -28,7 +28,7 @@
environment {
KUBECONFIG="$HOME/.kube/kind-config-voltha-minimal"
VOLTCONFIG="$HOME/.volt/config-minimal"
- PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$WORKSPACE/kind-voltha/bin"
+ PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$HOME/kind-voltha/bin"
TYPE="minimal"
FANCY=0
WITH_SIM_ADAPTERS="n"
@@ -64,7 +64,11 @@
stage('Download kind-voltha') {
steps {
sh """
- git clone https://github.com/ciena/kind-voltha.git
+ cd $HOME
+ [ -d kind-voltha ] || git clone https://github.com/ciena/kind-voltha.git
+ rm -rf $HOME/kind-voltha/scripts/logger
+ cd $HOME/kind-voltha
+ git pull
"""
}
}
@@ -72,9 +76,8 @@
stage('Deploy Voltha') {
steps {
sh """
- cd kind-voltha/
- JUST_K8S=y ./voltha up
- kail -n voltha -n default > $WORKSPACE/onos-voltha-combined.log &
+ cd $HOME/kind-voltha/
+ WAIT_ON_DOWN=y DEPLOY_K8S=n ./voltha down || ./voltha down
./voltha up
"""
}
@@ -83,9 +86,14 @@
stage('Run E2E Tests') {
steps {
sh '''
+ set +e
mkdir -p $WORKSPACE/RobotLogs
git clone https://gerrit.opencord.org/voltha-system-tests
- cd kind-voltha
+
+ cd $HOME/kind-voltha/scripts
+ ./log-collector.sh > /dev/null &
+ ./log-combine.sh > /dev/null &
+
for i in \$(seq 1 ${testRuns})
do
make -C $WORKSPACE/voltha-system-tests ${makeTarget}
@@ -101,40 +109,44 @@
always {
sh '''
set +e
- cp $WORKSPACE/kind-voltha/install-minimal.log $WORKSPACE/
+ cp $HOME/kind-voltha/install-minimal.log $WORKSPACE/
kubectl get pods --all-namespaces -o jsonpath="{range .items[*].status.containerStatuses[*]}{.image}{'\\t'}{.imageID}{'\\n'}" | sort | uniq -c
kubectl get nodes -o wide
kubectl get pods -o wide
kubectl get pods -n voltha -o wide
- sync
- pkill kail || true
+ sleep 60 # Wait for log-collector and log-combine to complete
## Pull out errors from log files
extract_errors_go() {
echo
echo "Error summary for $1:"
- grep $1 $WORKSPACE/onos-voltha-combined.log | grep '"level":"error"' | cut -d ' ' -f 2- | jq -r '.msg'
+ grep '"level":"error"' $HOME/kind-voltha/scripts/logger/combined/$1*
echo
}
extract_errors_python() {
echo
echo "Error summary for $1:"
- grep $1 $WORKSPACE/onos-voltha-combined.log | grep 'ERROR' | cut -d ' ' -f 2-
+ grep 'ERROR' $HOME/kind-voltha/scripts/logger/combined/$1*
echo
}
extract_errors_go voltha-rw-core > $WORKSPACE/error-report.log
extract_errors_go adapter-open-olt >> $WORKSPACE/error-report.log
extract_errors_python adapter-open-onu >> $WORKSPACE/error-report.log
- extract_errors_python voltha-ofagent >> $WORKSPACE/error-report.log
+ extract_errors_go voltha-ofagent >> $WORKSPACE/error-report.log
+ extract_errors_python onos >> $WORKSPACE/error-report.log
- gzip $WORKSPACE/onos-voltha-combined.log
+ cd $HOME/kind-voltha/scripts/logger/combined/
+ tar czf $WORKSPACE/container-logs.tgz *
- ## shut down voltha
- cd $WORKSPACE/kind-voltha/
- WAIT_ON_DOWN=y ./voltha down
+ cd $WORKSPACE
+ gzip *-combined.log || true
+
+ ## shut down voltha but leave kind-voltha cluster
+ cd $HOME/kind-voltha/
+ DEPLOY_K8S=n WAIT_ON_DOWN=y ./voltha down
'''
step([$class: 'RobotPublisher',
disableArchiveOutput: false,
@@ -145,7 +157,7 @@
passThreshold: 100,
reportFileName: 'RobotLogs/report*.html',
unstableThreshold: 0]);
- archiveArtifacts artifacts: '*.log,*.gz'
+ archiveArtifacts artifacts: '*.log,*.gz,*.tgz'
}
}
diff --git a/jjb/pipeline/voltha-go-tests.groovy b/jjb/pipeline/voltha-go-tests.groovy
index 5e519c2..38efb38 100644
--- a/jjb/pipeline/voltha-go-tests.groovy
+++ b/jjb/pipeline/voltha-go-tests.groovy
@@ -28,7 +28,7 @@
environment {
KUBECONFIG="$HOME/.kube/kind-config-voltha-minimal"
VOLTCONFIG="$HOME/.volt/config-minimal"
- PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$WORKSPACE/kind-voltha/bin"
+ PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$HOME/kind-voltha/bin"
TYPE="minimal"
FANCY=0
WITH_SIM_ADAPTERS="n"
@@ -64,7 +64,11 @@
stage('Download kind-voltha') {
steps {
sh """
- git clone https://github.com/ciena/kind-voltha.git
+ cd $HOME
+ [ -d kind-voltha ] || git clone https://github.com/ciena/kind-voltha.git
+ rm -rf $HOME/kind-voltha/scripts/logger
+ cd $HOME/kind-voltha
+ git pull
"""
}
}
@@ -72,8 +76,8 @@
stage('Deploy Voltha') {
steps {
sh """
- cd kind-voltha/
- JUST_K8S=y ./voltha up
+ cd $HOME/kind-voltha/
+ WAIT_ON_DOWN=y DEPLOY_K8S=n ./voltha down || ./voltha down
./voltha up
"""
}
@@ -86,7 +90,7 @@
mkdir -p $WORKSPACE/RobotLogs
git clone https://gerrit.opencord.org/voltha-system-tests
- cd $WORKSPACE/kind-voltha/scripts
+ cd $HOME/kind-voltha/scripts
./log-collector.sh > /dev/null &
./log-combine.sh > /dev/null &
@@ -100,7 +104,7 @@
always {
sh '''
set +e
- cp $WORKSPACE/kind-voltha/install-minimal.log $WORKSPACE/
+ cp $HOME/kind-voltha/install-minimal.log $WORKSPACE/
kubectl get pods --all-namespaces -o jsonpath="{range .items[*].status.containerStatuses[*]}{.image}{'\\t'}{.imageID}{'\\n'}" | sort | uniq -c
kubectl get nodes -o wide
kubectl get pods -o wide
@@ -112,14 +116,14 @@
extract_errors_go() {
echo
echo "Error summary for $1:"
- grep '"level":"error"' $WORKSPACE/kind-voltha/scripts/logger/combined/$1*
+ grep '"level":"error"' $HOME/kind-voltha/scripts/logger/combined/$1*
echo
}
extract_errors_python() {
echo
echo "Error summary for $1:"
- grep 'ERROR' $WORKSPACE/kind-voltha/scripts/logger/combined/$1*
+ grep 'ERROR' $HOME/kind-voltha/scripts/logger/combined/$1*
echo
}
@@ -129,15 +133,15 @@
extract_errors_go voltha-ofagent >> $WORKSPACE/error-report.log
extract_errors_python onos >> $WORKSPACE/error-report.log
- cd $WORKSPACE/kind-voltha/scripts/logger/combined/
+ cd $HOME/kind-voltha/scripts/logger/combined/
tar czf $WORKSPACE/container-logs.tgz *
cd $WORKSPACE
gzip *-combined.log || true
- ## shut down voltha
- cd $WORKSPACE/kind-voltha/
- WAIT_ON_DOWN=y ./voltha down
+ ## shut down voltha but leave kind-voltha cluster
+ cd $HOME/kind-voltha/
+ DEPLOY_K8S=n WAIT_ON_DOWN=y ./voltha down
'''
step([$class: 'RobotPublisher',
disableArchiveOutput: false,
diff --git a/jjb/pipeline/voltha-physical-functional-tests.groovy b/jjb/pipeline/voltha-physical-functional-tests.groovy
index 47ace1e..22eca23 100644
--- a/jjb/pipeline/voltha-physical-functional-tests.groovy
+++ b/jjb/pipeline/voltha-physical-functional-tests.groovy
@@ -23,7 +23,7 @@
label "${params.buildNode}"
}
options {
- timeout(time: 90, unit: 'MINUTES')
+ timeout(time: 120, unit: 'MINUTES')
}
environment {
diff --git a/jjb/pipeline/voltha-scale-measurements.groovy b/jjb/pipeline/voltha-scale-measurements.groovy
index 2a3453b..038c5b2 100644
--- a/jjb/pipeline/voltha-scale-measurements.groovy
+++ b/jjb/pipeline/voltha-scale-measurements.groovy
@@ -7,16 +7,6 @@
environment {
KUBECONFIG="$HOME/.kube/kind-config-voltha-minimal"
VOLTCONFIG="$HOME/.volt/config-minimal"
- PATH="$WORKSPACE/kind-voltha/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
- TYPE="minimal"
- FANCY=0
- SECONDS=0
- WITH_SIM_ADAPTERS="n"
- WITH_RADIUS="y"
- WITH_BBSIM="y"
- VOLTHA_LOG_LEVEL="WARN"
- CONFIG_SADIS="n"
- ROBOT_MISC_ARGS="-d $WORKSPACE/RobotLogs -v teardown_device:False"
SSHPASS="karaf"
DEPLOY_K8S="n"
}
@@ -56,23 +46,25 @@
}
steps {
sh '''
- helm install -n nem-monitoring cord/nem-monitoring
+ helm repo update
+ helm install -n nem-monitoring cord/nem-monitoring --set kpi_exporter.enabled=false,dashboards.xos=false,dashboards.onos=false,dashboards.aaa=false,dashboards.voltha=false
IFS=: read -r onosRepo onosTag <<< ${onosImg}
helm install -n onos onf/onos --set images.onos.repository=${onosRepo} --set images.onos.tag=${onosTag} ${extraHelmFlags}
IFS=: read -r volthaRepo volthaTag <<< ${volthaImg}
IFS=: read -r ofAgentRepo ofAgentTag <<< ${ofAgentImg}
- helm install -n voltha onf/voltha -f /home/cord/voltha-scale/voltha-values.yaml --set images.voltha.repository=${volthaRepo},images.voltha.tag=${volthaTag},images.ofagent.repository=${ofAgentRepo},images.ofagent.tag=${ofAgentTag} ${extraHelmFlags}
+ helm install -n voltha ${volthaChart} -f /home/cord/voltha-scale/voltha-values.yaml --set defaults.log_level=${logLevel},images.rw_core.repository=${volthaRepo},images.rw_core.tag=${volthaTag},images.ofagent_go.repository=${ofAgentRepo},images.ofagent_go.tag=${ofAgentTag} ${extraHelmFlags}
IFS=: read -r openoltAdapterRepo openoltAdapterTag <<< ${openoltAdapterImg}
- helm install -n openolt onf/voltha-adapter-openolt -f /home/cord/voltha-scale/voltha-values.yaml --set images.adapter_open_olt.repository=${openoltAdapterRepo},images.adapter_open_olt.tag=${openoltAdapterTag} ${extraHelmFlags}
+ helm install -n openolt ${openoltAdapterChart} -f /home/cord/voltha-scale/voltha-values.yaml --set defaults.log_level=${logLevel},images.adapter_open_olt.repository=${openoltAdapterRepo},images.adapter_open_olt.tag=${openoltAdapterTag} ${extraHelmFlags}
IFS=: read -r openonuAdapterRepo openonuAdapterTag <<< ${openonuAdapterImg}
- helm install -n openonu onf/voltha-adapter-openonu -f /home/cord/voltha-scale/voltha-values.yaml --set images.adapter_open_olt.repository=${openonuAdapterRepo},images.adapter_open_olt.tag=${openonuAdapterTag} ${extraHelmFlags}
+ helm install -n openonu ${openonuAdapterChart} -f /home/cord/voltha-scale/voltha-values.yaml --set defaults.log_level=${logLevel},images.adapter_open_onu.repository=${openonuAdapterRepo},images.adapter_open_onu.tag=${openonuAdapterTag} ${extraHelmFlags}
IFS=: read -r bbsimRepo bbsimTag <<< ${bbsimImg}
- helm install -n bbsim onf/bbsim --set pon=${ponPorts},onu=${onuPerPon},auth=${bbsimAuth},dhcp=${bbsimDhcp},delay=${BBSIMdelay},images.bbsim.repository=${bbsimRepo},images.bbsim.tag=${bbsimTag} ${extraHelmFlags}
+ helm install -n bbsim ${bbsimChart} --set enablePerf=true,pon=${ponPorts},onu=${onuPerPon},auth=${bbsimAuth},dhcp=${bbsimDhcp},delay=${BBSIMdelay},images.bbsim.repository=${bbsimRepo},images.bbsim.tag=${bbsimTag} ${extraHelmFlags}
+
helm install -n radius onf/freeradius ${extraHelmFlags}
bash /home/cord/voltha-scale/wait_for_pods.sh
@@ -126,8 +118,8 @@
stage('configuration') {
steps {
sh '''
- #Setting LOG level to WARN
- sshpass -e ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 30115 karaf@localhost log:set WARN
+ #Setting LOG level to ${logLevel}
+ sshpass -e ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 30115 karaf@localhost log:set ${logLevel}
kubectl exec $(kubectl get pods | grep bbsim | awk 'NR==1{print $1}') bbsimctl log warn false
#Setting link discovery
sshpass -e ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 30115 karaf@localhost cfg set org.onosproject.provider.lldp.impl.LldpLinkProvider enabled ${setLinkDiscovery}
@@ -206,18 +198,33 @@
echo $(voltctl device list | grep -v OLT | grep ACTIVE | wc -l) > onus.txt
echo "#-of-ONUs" > voltha-devices-count.txt
cat onus.txt >> voltha-devices-count.txt
-
+ '''
+ sh '''
echo $(sshpass -e ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 30115 karaf@localhost ports -e | grep BBSM | wc -l) > ports.txt
echo "#-of-ports" > onos-ports-count.txt
cat ports.txt >> onos-ports-count.txt
-
- kubectl get pods --all-namespaces -o jsonpath="{range .items[*].status.containerStatuses[*]}{.image}{'\\t'}{.imageID}{'\\n'}" | sort | uniq -c
+ '''
+ sh '''
+ kubectl get pods -o jsonpath="{range .items[*].status.containerStatuses[*]}{.image}{'\\t'}{.imageID}{'\\n'}" | sort | uniq -c
+ '''
+ sh '''
voltctl device list -o json > device-list.json
python -m json.tool device-list.json > voltha-devices-list.json
+ '''
+ sh '''
sshpass -e ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 30115 karaf@localhost ports > onos-ports-list.txt
- curl -s -X GET -G http://127.0.0.1:31301/api/v1/query --data-urlencode 'query=avg(rate(container_cpu_usage_seconds_total[10m])*100) by (pod)' | jq . > cpu-usage.json
+ curl -s -X GET -G http://127.0.0.1:31301/api/v1/query --data-urlencode 'query=avg(rate(container_cpu_usage_seconds_total[10m])*100) by (pod_name)' | jq . > cpu-usage.json
+ '''
+ sh '''
+ kubectl logs deployment/adapter-open-olt > open-olt-logs.txt
+ kubectl logs deployment/adapter-open-onu > open-onu-logs.txt
+ kubectl logs deployment/voltha-rw-core > voltha-rw-core-logs.txt
+ kubectl logs deployment/voltha-ofagent > voltha-ofagent-logs.txt
+ kubectl logs deployment/bbsim > bbsim-logs.txt
+ '''
+ sh '''
rm -rf BBSM-12345123451234512345-00000000000001-v1.json device-list.json onus.txt ports.txt temp.txt
- '''
+ '''
plot([
csvFileName: 'plot-numbers.csv',
csvSeries: [[displayTableFlag: false, exclusionValues: '', file: 'voltha-devices-count.txt', inclusionFlag: 'OFF', url: ''], [displayTableFlag: false, exclusionValues: '', file: 'onos-ports-count.txt', inclusionFlag: 'OFF', url: '']],
diff --git a/jjb/pipeline/xos-service-upgrade.groovy b/jjb/pipeline/xos-service-upgrade.groovy
index a092945..12fb69b 100644
--- a/jjb/pipeline/xos-service-upgrade.groovy
+++ b/jjb/pipeline/xos-service-upgrade.groovy
@@ -16,6 +16,7 @@
// Checks functionality of the helm-chart, without overriding the version/tag used
def serviceName = "${gerritProject}"
+def xosCoreVersionMismatch = false
pipeline {
@@ -44,17 +45,6 @@
}
}
- stage('patch') {
- steps {
- sh '''
- pushd cord
- PROJECT_PATH=\$(xmllint --xpath "string(//project[@name=\\\"${gerritProject}\\\"]/@path)" .repo/manifests/default.xml)
- repo download "\$PROJECT_PATH" "${gerritChangeNumber}/${gerritPatchsetNumber}"
- popd
- '''
- }
- }
-
stage('minikube') {
steps {
/* see https://github.com/kubernetes/minikube/#linux-continuous-integration-without-vm-support */
@@ -72,7 +62,7 @@
timeout(3) {
waitUntil {
sleep 5
- def kc_ret = sh script: "kubectl get po", returnStatus: true
+ def kc_ret = sh script: "kubectl get pods", returnStatus: true
return (kc_ret == 0);
}
}
@@ -91,9 +81,86 @@
}
}
+ stage('Verify xos-core version requirements') {
+ steps {
+ script {
+ if (serviceName == "olt-service") {
+ serviceName = "volt"
+ }
+ else if (serviceName == "onos-service") {
+ serviceName = "onos"
+ }
+ else if (serviceName == "kubernetes-service") {
+ serviceName = "kubernetes"
+ }
+ }
+ result = sh returnStdout: true, script: """
+ #!/usr/bin/env bash
+ set -eu -o pipefail
+
+ # Obtain git tag of the service corresponding to the the docker image
+ # used in the latest released version of the helm chart (i.e., HEAD
+ # of cord/helm-charts master branch, which should be already checked
+ # out by repo).
+ pushd cord/helm-charts
+ export RELEASED_GIT_TAG=\$(echo -e "import yaml\\nwith open('xos-services/${serviceName}/Chart.yaml', 'r') as f: print yaml.safe_load(f)['appVersion']" | python)
+ popd
+
+ # Obtain the xos-core version requirement from the config.yaml of the
+ # released service.
+ pushd cord
+ PROJECT_PATH=\$(xmllint --xpath "string(//project[@name=\\\"${gerritProject}\\\"]/@path)" .repo/manifest.xml)
+ pushd \${PROJECT_PATH}
+ git fetch --all --tags
+ git checkout tags/\${RELEASED_GIT_TAG} -b foobar
+ export RELEASED_CORE_VER_REQ=\$(echo -e "import yaml\\nwith open('xos/synchronizer/config.yaml', 'r') as f: yaml.safe_load(f)['core_version']" | python)
+ popd
+ popd
+
+ # Do the same for the patchset we want to verify.
+ pushd cord
+ repo download "\$PROJECT_PATH" "${gerritChangeNumber}/${gerritPatchsetNumber}"
+ pushd \${PROJECT_PATH}
+ export PATCHSET_CORE_VER_REQ=\$(echo -e "import yaml\\nwith open('xos/synchronizer/config.yaml', 'r') as f: yaml.safe_load(f)['core_version']" | python)
+ popd
+ popd
+
+ echo "RELEASED_CORE_VER_REQ: \${RELEASED_CORE_VER_REQ}"
+ echo "PATCHSET_CORE_VER_REQ: \${PATCHSET_CORE_VER_REQ}"
+
+ if [ "\${PATCHSET_CORE_VER_REQ}" == "\${RELEASED_CORE_VER_REQ}" ]; then
+ echo 0
+ else
+ # xosCoreVersionMismatch is true
+ echo 1
+ fi
+ """
+ xosCoreVersionMismatch = result.toBoolean()
+ }
+ }
+
+ if( xosCoreVersionMismatch ) {
+ echo "Detected xos-core version requirements mismatch. Will skip the rest of the pipeline and return SUCCESS"
+ currentBuild.result = 'SUCCESS'
+ return
+ }
+
+ // The patchset should be already checked out, but for consistency with
+ // other pipeline jobs, we re-do the same here.
+ stage('patch') {
+ steps {
+ sh '''
+ pushd cord
+ PROJECT_PATH=\$(xmllint --xpath "string(//project[@name=\\\"${gerritProject}\\\"]/@path)" .repo/manifest.xml)
+ repo download "\$PROJECT_PATH" "${gerritChangeNumber}/${gerritPatchsetNumber}"
+ popd
+ '''
+ }
+ }
+
stage('Install XOS w/Service') {
steps {
- script {
+ script {
if (serviceName == "olt-service") {
serviceName = "volt"
}
@@ -166,7 +233,13 @@
stage('Test Pre-Upgrade') {
steps {
sh """
- pushd cord/test/cord-tester/src/test/cord-api/Tests
+ #!/usr/bin/env bash
+ set -ex -o pipefail
+
+ pushd cord/test/cord-tester
+ make venv_cord
+ source venv_cord/bin/activate
+ cd src/test/cord-api/Tests
CORE_CONTAINER=\$(docker ps | grep k8s_xos-core | awk '{print \$1}')
CHAM_CONTAINER=\$(docker ps | grep k8s_xos-chameleon | awk '{print \$1}')
@@ -197,6 +270,7 @@
sh """
#!/usr/bin/env bash
set -eu -o pipefail
+
pushd $WORKSPACE/cord/orchestration/xos-services/${gerritProject}
export DOCKER_TAG=\$(cat VERSION)-test
export DOCKER_REPOSITORY=xosproject/
@@ -233,13 +307,20 @@
stage('Test Post-Upgrade') {
steps {
sh """
+ #!/usr/bin/env bash
+ set -ex -o pipefail
+
+ cd cord/test/cord-tester
+ make venv_cord
+ source venv_cord/bin/activate
+ cd src/test/cord-api/Tests
+
CORE_CONTAINER=\$(docker ps | grep k8s_xos-core | awk '{print \$1}')
export testname=_service_api.robot
export library=_library.robot
SERVICES=\$(docker exec -i \$CORE_CONTAINER /bin/bash -c "cd /opt/xos/dynamic_services/;find -name '*.xproto'" | awk -F[//] '{print \$2}')
echo \$SERVICES
- cd $WORKSPACE/cord/test/cord-tester/src/test/cord-api/Tests
for i in \$SERVICES; do bash -c "robot -v SETUP_FLAG:Setup -i get -d Log -T -v TESTLIBRARY:${serviceName}_library.robot \$i\$testname"; sleep 2; done || true
"""
}
@@ -264,13 +345,18 @@
timeout 300 bash -c "until http -a admin@opencord.org:letmein GET http://127.0.0.1:30001/xosapi/v1/dynamicload/load_status | jq '.services[] | select(.name==\\"core\\").state'| grep -q present; do echo 'Waiting for Core to be loaded'; sleep 5; done"
timeout 300 bash -c "until http -a admin@opencord.org:letmein GET http://127.0.0.1:30001/xosapi/v1/dynamicload/load_status | jq '.services[] | select(.name==\\"${gerritProject}\\").state'| grep -q present; do echo 'Waiting for Service to be loaded'; sleep 5; done"
sleep 120
- cd $WORKSPACE/cord/test/cord-tester/src/test/cord-api/Tests
+
+ cd $WORKSPACE/cord/test/cord-tester
+ make venv_cord
+ source venv_cord/bin/activate
+ cd src/test/cord-api/Tests
CORE_CONTAINER=\$(docker ps | grep k8s_xos-core | awk '{print \$1}')
export testname=_service_api.robot
export library=_library.robot
SERVICES=\$(docker exec -i \$CORE_CONTAINER /bin/bash -c "cd /opt/xos/dynamic_services/;find -name '*.xproto'" | awk -F[//] '{print \$2}')
+
echo \$SERVICES
for i in \$SERVICES; do bash -c "robot -v SETUP_FLAG:Setup -i get -d Log -T -v TESTLIBRARY:${gerritProject}_library.robot \$i\$testname"; sleep 2; done || true
@@ -325,7 +411,7 @@
reportFileName: 'RobotLogs/report*.html',
unstableThreshold: 0]);
archiveArtifacts artifacts: '*.log'
- step([$class: 'Mailer', notifyEveryUnstableBuild: true, recipients: "kailash@opennetworking.org, scottb@opennetworking.org", sendToIndividuals: false])
+ step([$class: 'Mailer', notifyEveryUnstableBuild: true, recipients: "scottb@opennetworking.org", sendToIndividuals: false])
}
}
}
diff --git a/jjb/shell/ansiblelint.sh b/jjb/shell/ansiblelint.sh
index ebb5328..f9eca6f 100755
--- a/jjb/shell/ansiblelint.sh
+++ b/jjb/shell/ansiblelint.sh
@@ -16,7 +16,7 @@
# ansiblelint.sh - check all yaml files that they pass the ansible-lint tool
-set +e -u -o pipefail
+set +e -o pipefail
fail_ansible=0
@@ -30,16 +30,16 @@
# allow directories to be skipped
# space separated directory list expected in SKIP_DIRS
-
-SKIP_DIRS=""
SKIP_REGEX=""
-if [[ -n $SKIP_DIRS ]]; then
+if [ -n "$SKIP_DIRS" ]; then
echo "=> Skipping files matching these directories: $SKIP_DIRS"
# prefix with ./ as find generates, swap spaces for pipes
- SKIP_REGEX=$(echo $SKIP_DIRS | sed 's/[^ ]*/.\/&\//g' | sed 's/ /|/g')
+ SKIP_REGEX=$(echo "$SKIP_DIRS" | sed 's/[^ ]*/.\/&\//g' | sed 's/ /|/g')
fi
+set -u
+
while IFS= read -r -d '' yf
do
if [[ $yf =~ $SKIP_REGEX ]]; then
diff --git a/jjb/verify/ofagent-go.yaml b/jjb/verify/ofagent-go.yaml
index 48f6269..023544a 100644
--- a/jjb/verify/ofagent-go.yaml
+++ b/jjb/verify/ofagent-go.yaml
@@ -23,6 +23,8 @@
unit-test-targets: 'lint sca test'
unit-test-keep-going: 'true'
junit-allow-empty-results: true
+ - 'voltha-patch-test':
+ pipeline-script: 'voltha-bbsim-tests.groovy'
- job-group:
name: 'publish-ofagent-go-jobs'
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index 1dff600..3aeb284 100644
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -28,6 +28,16 @@
time-trigger: "H H/12 * * *"
- 'voltha-periodic-test':
+ name: 'periodic-voltha-errorscenarios-test'
+ build-node: 'qct-pod4-node2'
+ default-image-tag: 'master'
+ code-branch: 'master'
+ make-target: bbsim-errorscenarios
+ onus: 1
+ pons: 1
+ time-trigger: "H H/6 * * *"
+
+ - 'voltha-periodic-test':
name: 'periodic-voltha-system-test'
pipeline-script: 'voltha-system-test-bbsim.groovy'
build-node: 'ubuntu16.04-basebuild-4c-8g'
@@ -109,7 +119,6 @@
robot-args: ''
gerrit-project: ''
-
description: |
<!-- Managed by Jenkins Job Builder -->
Created by {id} job-template from ci-management/jjb/voltha-e2e.yaml <br /><br />
@@ -133,7 +142,7 @@
- string:
name: extraHelmFlags
- default: '--set defaults.image_tag={default-image-tag},onu={onus},pon={pons},use_ofagent_go=True,images.ofagent.repository=voltha/ofagent-go,images.ofagent.tag=master'
+ default: '--set defaults.image_tag={default-image-tag},onu={onus},pon={pons}'
description: 'Helm flags to pass to ./voltha up'
- string:
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index f5b69f4..6b43359 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -8,6 +8,22 @@
jobs:
- 'voltha-scale-measurements-periodic':
+ name: 'voltha-scale-measurements-periodic-8-16-200ms'
+ build-node: 'onf-pod1-head-node'
+ time-trigger: "H H/4 * * *"
+ onuPerPon: 16
+ ponPorts: 8
+ expectedOnus: 128
+ BBSIMdelay: 200
+ - 'voltha-scale-measurements-periodic':
+ name: 'voltha-scale-measurements-periodic-8-16-1000ms'
+ build-node: 'onf-pod1-head-node'
+ time-trigger: "H H/4 * * *"
+ onuPerPon: 16
+ ponPorts: 8
+ expectedOnus: 128
+ BBSIMdelay: 1000
+ - 'voltha-scale-measurements-periodic':
name: 'voltha-scale-measurements-periodic-8-32-200ms'
build-node: 'onf-pod1-head-node'
time-trigger: "H H/4 * * *"
@@ -55,6 +71,7 @@
ponPorts: 4
expectedOnus: 128
BBSIMdelay: 1000
+
- 'voltha-scale-measurements-periodic':
name: 'voltha-scale-measurements-periodic-16-32-200ms'
build-node: 'onf-pod1-head-node'
@@ -63,14 +80,29 @@
ponPorts: 16
expectedOnus: 512
BBSIMdelay: 200
+ # multi-adapter-tmp-changes
+ volthaImg: "matteoscandolo/voltha-rw-core:partition"
+ ofAgentImg: "voltha/voltha-ofagent-go:master"
+ openoltAdapterImg: "matteoscandolo/voltha-openolt-adapter:partition"
+ openonuAdapterImg: "matteoscandolo/voltha-openonu-adapter:partition"
+ openonuAdapterChart: "/home/cord/voltha-helm-charts/voltha-adapter-openonu"
+ extraHelmFlags: "--set use_ofagent_go=true -f /home/cord/partition-values.yaml"
- 'voltha-scale-measurements-periodic':
- name: 'voltha-scale-measurements-periodic-16-32-1000ms'
+ name: 'voltha-scale-measurements-periodic-16-64-200ms'
build-node: 'onf-pod1-head-node'
time-trigger: "H H/4 * * *"
- onuPerPon: 32
+ onuPerPon: 64
ponPorts: 16
- expectedOnus: 512
- BBSIMdelay: 1000
+ expectedOnus: 1024
+ BBSIMdelay: 200
+ # multi-adapter-tmp-changes
+ volthaImg: "matteoscandolo/voltha-rw-core:partition"
+ ofAgentImg: "voltha/voltha-ofagent-go:master"
+ openoltAdapterImg: "matteoscandolo/voltha-openolt-adapter:partition"
+ openonuAdapterImg: "matteoscandolo/voltha-openonu-adapter:partition"
+ openonuAdapterChart: "/home/cord/voltha-helm-charts/voltha-adapter-openonu"
+ extraHelmFlags: "--set use_ofagent_go=true -f /home/cord/partition-values.yaml"
+
- 'voltha-scale-measurements-periodic':
name: 'voltha-scale-measurements-periodic-4-64-200ms'
build-node: 'onf-pod1-head-node'
@@ -180,6 +212,19 @@
build-timeout: '{build-timeout}'
jenkins-ssh-credential: '{jenkins-ssh-credential}'
+ # default parameters
+ bbsimImg: voltha/bbsim:master
+ bbsimChart: onf/bbsim
+ volthaImg: voltha/voltha-rw-core:master
+ ofAgentImg: voltha/voltha-ofagent-go:master
+ volthaChart: onf/voltha
+ openoltAdapterImg: voltha/voltha-openolt-adapter:master
+ openoltAdapterChart: onf/voltha-adapter-openolt
+ openonuAdapterImg: voltha/voltha-openonu-adapter:master
+ openonuAdapterChart: onf/voltha-adapter-openonu
+ onosImg: voltha/voltha-onos:4.0.1
+ extraHelmFlags: ''
+
parameters:
- string:
name: buildNode
@@ -187,6 +232,11 @@
description: 'Name of the Jenkins node to run the job on'
- string:
+ name: logLevel
+ default: 'WARN'
+ description: 'Log level for all the components'
+
+ - string:
name: onuPerPon
default: '{onuPerPon}'
description: 'Number of ONUs to provision'
@@ -248,37 +298,57 @@
- string:
name: bbsimImg
- default: 'voltha/bbsim:master'
+ default: '{bbsimImg}'
description: 'Custom image selection for BBSIM (repo:tag)'
- string:
+ name: bbsimChart
+ default: '{bbsimChart}'
+ description: 'BBSim chart name (or location on file system)'
+
+ - string:
name: volthaImg
- default: 'voltha/voltha-rw-core:master'
+ default: '{volthaImg}'
description: 'Custom image selection for VOLTHA (repo:tag)'
- string:
name: ofAgentImg
- default: 'voltha/voltha-ofagent:master'
- description: 'Custom image selection for OfAgent (repo:tag)'
+ default: '{ofAgentImg}'
+ description: 'Custom image selection for OfAgent (repo:tag), only supports the go version'
+
+ - string:
+ name: volthaChart
+ default: '{volthaChart}'
+ description: 'VOLTHA chart name (or location on file system)'
- string:
name: openoltAdapterImg
- default: voltha/voltha-openolt-adapter:master
+ default: '{openoltAdapterImg}'
description: 'Custom image selection for Openolt Adapter (repo:tag)'
- string:
+ name: openoltAdapterChart
+ default: '{openoltAdapterChart}'
+ description: 'OpenOLT chart name (or location on file system)'
+
+ - string:
name: openonuAdapterImg
- default: voltha/voltha-openonu-adapter:master
+ default: '{openonuAdapterImg}'
description: 'Custom image selection for Openonu Adapter (repo:tag)'
- string:
+ name: openonuAdapterChart
+ default: '{openonuAdapterChart}'
+ description: 'OpenONU chart name (or location on file system)'
+
+ - string:
name: onosImg
- default: voltha/voltha-onos:4.0.1
+ default: '{onosImg}'
description: 'Custom image selection for Openonu Adapter (repo:tag)'
- string:
name: extraHelmFlags
- default: ''
+ default: '{extraHelmFlags}'
description: 'Any extra helm parameters you want (passed to every helm install command)'
project-type: pipeline
@@ -312,6 +382,19 @@
build-timeout: '{build-timeout}'
jenkins-ssh-credential: '{jenkins-ssh-credential}'
+ # default parameters
+ bbsimImg: "voltha/bbsim:master"
+ bbsimChart: "onf/bbsim"
+ volthaImg: "voltha/voltha-rw-core:master"
+ ofAgentImg: "voltha/voltha-ofagent-go:master"
+ volthaChart: "onf/voltha"
+ openoltAdapterImg: "voltha/voltha-openolt-adapter:master"
+ openoltAdapterChart: "onf/voltha-adapter-openolt"
+ openonuAdapterImg: "voltha/voltha-openonu-adapter:master"
+ openonuAdapterChart: "onf/voltha-adapter-openonu"
+ onosImg: "voltha/voltha-onos:4.0.1"
+ extraHelmFlags: ''
+
parameters:
- string:
name: buildNode
@@ -319,6 +402,11 @@
description: 'Name of the Jenkins node to run the job on'
- string:
+ name: logLevel
+ default: 'WARN'
+ description: 'Log level for all the components'
+
+ - string:
name: onuPerPon
default: 1
description: 'Number of ONUs to provision'
@@ -380,37 +468,57 @@
- string:
name: bbsimImg
- default: voltha/bbsim:master
+ default: '{bbsimImg}'
description: 'Custom image selection for BBSIM (repo:tag)'
- string:
+ name: bbsimChart
+ default: '{bbsimChart}'
+ description: 'BBSim chart name (or location on file system)'
+
+ - string:
name: volthaImg
- default: voltha/voltha-rw-core:master
+ default: '{volthaImg}'
description: 'Custom image selection for VOLTHA (repo:tag)'
- string:
name: ofAgentImg
- default: 'voltha/voltha-ofagent:master'
- description: 'Custom image selection for OfAgent (repo:tag)'
+ default: '{ofAgentImg}'
+ description: 'Custom image selection for OfAgent (repo:tag), only supports the go version'
+
+ - string:
+ name: volthaChart
+ default: '{volthaChart}'
+ description: 'VOLTHA chart name (or location on file system)'
- string:
name: openoltAdapterImg
- default: voltha/voltha-openolt-adapter:master
+ default: '{openoltAdapterImg}'
description: 'Custom image selection for Openolt Adapter (repo:tag)'
- string:
+ name: openoltAdapterChart
+ default: '{openoltAdapterChart}'
+ description: 'OpenOLT chart name (or location on file system)'
+
+ - string:
name: openonuAdapterImg
- default: voltha/voltha-openonu-adapter:master
+ default: '{openonuAdapterImg}'
description: 'Custom image selection for Openonu Adapter (repo:tag)'
- string:
+ name: openonuAdapterChart
+ default: '{openonuAdapterChart}'
+ description: 'OpenONU chart name (or location on file system)'
+
+ - string:
name: onosImg
- default: voltha/voltha-onos:4.0.1
+ default: '{onosImg}'
description: 'Custom image selection for Openonu Adapter (repo:tag)'
- string:
name: extraHelmFlags
- default: ''
+ default: '{extraHelmFlags}'
description: 'Any extra helm parameters you want (passed to every helm install command)'
project-type: pipeline