Sync software-updates logic with bbsim-tests
jjb/voltha-e2e.yaml
jjb/voltha-e2e/master.yaml
jjb/voltha-e2e/voltha-2.12.yaml
-------------------------------
o Create a release/branch job for the dt-fttb periodic test.
Change-Id: Ie9c5819dc221fd450feabca7d8a62ae5e0847597
diff --git a/jjb/pipeline/voltha/master/software-upgrades.groovy b/jjb/pipeline/voltha/master/software-upgrades.groovy
index 1238a53..8462c75 100755
--- a/jjb/pipeline/voltha/master/software-upgrades.groovy
+++ b/jjb/pipeline/voltha/master/software-upgrades.groovy
@@ -21,101 +21,135 @@
remote: 'https://gerrit.opencord.org/ci-management.git'
])
+// -----------------------------------------------------------------------
+// Intent:
+// -----------------------------------------------------------------------
+String branchName() {
+ String name = 'master'
+
+ // [TODO] Sanity check the target branch
+ // if (name != jenkins.branch) { fatal }
+ return(name)
+}
+
+// -----------------------------------------------------------------------
+// Intent: Due to lack of a reliable stack trace, construct a literal.
+// Jenkins will re-write the call stack for serialization.
+// -----------------------------------------------------------------------
+String getIam(String func) {
+ String branchName = branchName()
+ String src = [
+ 'ci-management',
+ 'jjb',
+ 'pipeline',
+ 'voltha',
+ branchName,
+ 'software-upgrades.groovy'
+ ].join('/')
+
+ String name = [src, func].join('::')
+ return(name)
+}
+
+// -----------------------------------------------------------------------
// fetches the versions/tags of the voltha component
// returns the deployment version which is one less than the latest available tag of the repo, first voltha stack gets deployed using this;
// returns the test version which is the latest tag of the repo, the component upgrade gets tested on this.
// Note: if there is a major version change between deployment and test tags, then deployment tag will be same as test tag, i.e. both as latest.
+// -----------------------------------------------------------------------
def get_voltha_comp_versions(component, base_deploy_tag) {
- def comp_test_tag = sh (
- script: "git ls-remote --refs --tags https://github.com/opencord/${component} | cut --delimiter='/' --fields=3 | tr '-' '~' | sort --version-sort | tail --lines=1 | sed 's/v//'",
- returnStdout: true
+ def comp_test_tag = sh(
+ script: "git ls-remote --refs --tags https://github.com/opencord/${component} | cut --delimiter='/' --fields=3 | tr '-' '~' | sort --version-sort | tail --lines=1 | sed 's/v//'",
+ returnStdout: true
).trim()
- def comp_deploy_tag = sh (
- script: "git ls-remote --refs --tags https://github.com/opencord/${component} | cut --delimiter='/' --fields=3 | tr '-' '~' | sort --version-sort | tail --lines=2 | head -n 1 | sed 's/v//'",
- returnStdout: true
+ def comp_deploy_tag = sh(
+ script: "git ls-remote --refs --tags https://github.com/opencord/${component} | cut --delimiter='/' --fields=3 | tr '-' '~' | sort --version-sort | tail --lines=2 | head -n 1 | sed 's/v//'",
+ returnStdout: true
).trim()
def comp_deploy_major = comp_deploy_tag.substring(0, comp_deploy_tag.indexOf('.'))
def comp_test_major = comp_test_tag.substring(0, comp_test_tag.indexOf('.'))
- if ( "${comp_deploy_major.trim()}" != "${comp_test_major.trim()}") {
- comp_deploy_tag = comp_test_tag
+ if ("${comp_deploy_major.trim()}" != "${comp_test_major.trim()}") {
+ comp_deploy_tag = comp_test_tag
}
- if ( "${comp_test_tag.trim()}" == "${base_deploy_tag.trim()}") {
- comp_deploy_tag = comp_test_tag
- comp_test_tag = "master"
+ if ("${comp_test_tag.trim()}" == "${base_deploy_tag.trim()}") {
+ comp_deploy_tag = comp_test_tag
+ comp_test_tag = "master"
}
println "${component}: deploy_tag: ${comp_deploy_tag}, test_tag: ${comp_test_tag}"
return [comp_deploy_tag, comp_test_tag]
}
+// -----------------------------------------------------------------------
+// -----------------------------------------------------------------------
def test_software_upgrade(name) {
- def infraNamespace = "infra"
- def volthaNamespace = "voltha"
- def openolt_adapter_deploy_tag = ""
- def openolt_adapter_test_tag = ""
- def openonu_adapter_deploy_tag = ""
- def openonu_adapter_test_tag = ""
- def rw_core_deploy_tag = ""
- def rw_core_test_tag = ""
- def ofagent_deploy_tag = ""
- def ofagent_test_tag = ""
- def logsDir = "$WORKSPACE/${name}"
- stage('Deploy Voltha - '+ name) {
- timeout(10) {
- // start logging
- sh """
+ def infraNamespace = "infra"
+ def volthaNamespace = "voltha"
+ def openolt_adapter_deploy_tag = ''
+ def openolt_adapter_test_tag = ''
+ def openonu_adapter_deploy_tag = ''
+ def openonu_adapter_test_tag = ''
+ def rw_core_deploy_tag = ''
+ def rw_core_test_tag = ''
+ def ofagent_deploy_tag = ''
+ def ofagent_test_tag = ''
+ def logsDir = "$WORKSPACE/${name}"
+ stage('Deploy Voltha - ' + name) {
+ timeout(10) {
+ // start logging
+ sh """
rm -rf ${logsDir} || true
mkdir -p ${logsDir}
_TAG=kail-${name} kail -n ${infraNamespace} -n ${volthaNamespace} > ${logsDir}/onos-voltha-startup-combined.log &
"""
- def extraHelmFlags = extraHelmFlags.trim()
- if ("${name}" == "onos-app-upgrade" || "${name}" == "onu-software-upgrade" || "${name}" == "onu-software-upgrade-omci-extended-msg" || "${name}" == "voltha-component-upgrade" || "${name}" == "voltha-component-rolling-upgrade") {
- extraHelmFlags = " --set global.log_level=${logLevel.toUpperCase()},onu=1,pon=1 --set onos-classic.replicas=3,onos-classic.atomix.replicas=3 " + extraHelmFlags
- }
- if ("${name}" == "onu-software-upgrade" || "${name}" == "onu-software-upgrade-omci-extended-msg") {
- extraHelmFlags = " --set global.extended_omci_support.enabled=true " + extraHelmFlags
- }
- if ("${name}" == "onu-software-upgrade-omci-extended-msg") {
- extraHelmFlags = " --set omccVersion=180 " + extraHelmFlags
- }
- if ("${name}" == "onu-image-dwl-simultaneously") {
- extraHelmFlags = " --set global.log_level=${logLevel.toUpperCase()},onu=2,pon=2 --set onos-classic.replicas=3,onos-classic.atomix.replicas=3 " + extraHelmFlags
- }
- if ("${name}" == "onos-app-upgrade" || "${name}" == "onu-software-upgrade" || "${name}" == "onu-software-upgrade-omci-extended-msg" || "${name}" == "onu-image-dwl-simultaneously") {
- extraHelmFlags = " --set global.image_tag=master --set onos-classic.image.tag=master " + extraHelmFlags
- }
- if ("${name}" == "voltha-component-upgrade" || "${name}" == "voltha-component-rolling-upgrade") {
- extraHelmFlags = " --set images.onos_config_loader.tag=master-onos-config-loader --set onos-classic.image.tag=master " + extraHelmFlags
- }
- extraHelmFlags = extraHelmFlags + " --set onos-classic.onosSshPort=30115 --set onos-classic.onosApiPort=30120 "
- extraHelmFlags = extraHelmFlags + " --set voltha.onos_classic.replicas=3"
- //ONOS custom image handling
- if ( onosImg.trim() != '' ) {
- String[] split;
- onosImg = onosImg.trim()
- split = onosImg.split(':')
- extraHelmFlags = extraHelmFlags + " --set onos-classic.image.repository=" + split[0] +",onos-classic.image.tag=" + split[1] + " "
- }
- Integer olts = 1
- if ("${name}" == "onu-image-dwl-simultaneously") {
- olts = 2
- }
- if ("${name}" == "voltha-component-upgrade" || "${name}" == "voltha-component-rolling-upgrade") {
- // fetch voltha components versions/tags
- (openolt_adapter_deploy_tag, openolt_adapter_test_tag) = get_voltha_comp_versions("voltha-openolt-adapter", openoltAdapterDeployBaseTag.trim())
- extraHelmFlags = extraHelmFlags + " --set voltha-adapter-openolt.images.adapter_open_olt.tag=${openolt_adapter_deploy_tag} "
- (openonu_adapter_deploy_tag, openonu_adapter_test_tag) = get_voltha_comp_versions("voltha-openonu-adapter-go", openonuAdapterDeployBaseTag.trim())
- extraHelmFlags = extraHelmFlags + " --set voltha-adapter-openonu.images.adapter_open_onu_go.tag=${openonu_adapter_deploy_tag} "
- (rw_core_deploy_tag, rw_core_test_tag) = get_voltha_comp_versions("voltha-go", rwCoreDeployBaseTag.trim())
- extraHelmFlags = extraHelmFlags + " --set voltha.images.rw_core.tag=${rw_core_deploy_tag} "
- (ofagent_deploy_tag, ofagent_test_tag) = get_voltha_comp_versions("ofagent-go", ofagentDeployBaseTag.trim())
- extraHelmFlags = extraHelmFlags + " --set voltha.images.ofagent.tag=${ofagent_deploy_tag} "
- }
- def localCharts = false
- // Currently only testing with ATT workflow
- // TODO: Support for other workflows
- volthaDeploy([bbsimReplica: olts.toInteger(), workflow: "att", extraHelmFlags: extraHelmFlags, localCharts: localCharts])
- // stop logging
- sh """
+ def extraHelmFlags = extraHelmFlags.trim()
+ if ("${name}" == "onos-app-upgrade" || "${name}" == "onu-software-upgrade" || "${name}" == "onu-software-upgrade-omci-extended-msg" || "${name}" == "voltha-component-upgrade" || "${name}" == "voltha-component-rolling-upgrade") {
+ extraHelmFlags = " --set global.log_level=${logLevel.toUpperCase()},onu=1,pon=1 --set onos-classic.replicas=3,onos-classic.atomix.replicas=3 " + extraHelmFlags
+ }
+ if ("${name}" == "onu-software-upgrade" || "${name}" == "onu-software-upgrade-omci-extended-msg") {
+ extraHelmFlags = " --set global.extended_omci_support.enabled=true " + extraHelmFlags
+ }
+ if ("${name}" == "onu-software-upgrade-omci-extended-msg") {
+ extraHelmFlags = " --set omccVersion=180 " + extraHelmFlags
+ }
+ if ("${name}" == "onu-image-dwl-simultaneously") {
+ extraHelmFlags = " --set global.log_level=${logLevel.toUpperCase()},onu=2,pon=2 --set onos-classic.replicas=3,onos-classic.atomix.replicas=3 " + extraHelmFlags
+ }
+ if ("${name}" == "onos-app-upgrade" || "${name}" == "onu-software-upgrade" || "${name}" == "onu-software-upgrade-omci-extended-msg" || "${name}" == "onu-image-dwl-simultaneously") {
+ extraHelmFlags = " --set global.image_tag=master --set onos-classic.image.tag=master " + extraHelmFlags
+ }
+ if ("${name}" == "voltha-component-upgrade" || "${name}" == "voltha-component-rolling-upgrade") {
+ extraHelmFlags = " --set images.onos_config_loader.tag=master-onos-config-loader --set onos-classic.image.tag=master " + extraHelmFlags
+ }
+ extraHelmFlags += " --set onos-classic.onosSshPort=30115 --set onos-classic.onosApiPort=30120 "
+ extraHelmFlags += " --set voltha.onos_classic.replicas=3"
+ //ONOS custom image handling
+ if ( onosImg.trim() != '' ) {
+ String[] split;
+ onosImg = onosImg.trim()
+ split = onosImg.split(':')
+ extraHelmFlags += " --set onos-classic.image.repository=" + split[0] +",onos-classic.image.tag=" + split[1] + " "
+ }
+ Integer olts = 1
+ if ("${name}" == 'onu-image-dwl-simultaneously') {
+ olts = 2
+ }
+ if ("${name}" == 'voltha-component-upgrade' || "${name}" == 'voltha-component-rolling-upgrade') {
+ // fetch voltha components versions/tags
+ (openolt_adapter_deploy_tag, openolt_adapter_test_tag) = get_voltha_comp_versions('voltha-openolt-adapter', openoltAdapterDeployBaseTag.trim())
+ extraHelmFlags += " --set voltha-adapter-openolt.images.adapter_open_olt.tag=${openolt_adapter_deploy_tag} "
+ (openonu_adapter_deploy_tag, openonu_adapter_test_tag) = get_voltha_comp_versions('voltha-openonu-adapter-go', openonuAdapterDeployBaseTag.trim())
+ extraHelmFlags += " --set voltha-adapter-openonu.images.adapter_open_onu_go.tag=${openonu_adapter_deploy_tag} "
+ (rw_core_deploy_tag, rw_core_test_tag) = get_voltha_comp_versions('voltha-go', rwCoreDeployBaseTag.trim())
+ extraHelmFlags += " --set voltha.images.rw_core.tag=${rw_core_deploy_tag} "
+ (ofagent_deploy_tag, ofagent_test_tag) = get_voltha_comp_versions('ofagent-go', ofagentDeployBaseTag.trim())
+ extraHelmFlags += " --set voltha.images.ofagent.tag=${ofagent_deploy_tag} "
+ }
+ def localCharts = false
+ // Currently only testing with ATT workflow
+ // TODO: Support for other workflows
+ volthaDeploy([bbsimReplica: olts.toInteger(), workflow: 'att', extraHelmFlags: extraHelmFlags, localCharts: localCharts])
+ // stop logging
+ sh """
P_IDS="\$(ps e -ww -A | grep "_TAG=kail-${name}" | grep -v grep | awk '{print \$1}')"
if [ -n "\$P_IDS" ]; then
echo \$P_IDS
@@ -127,20 +161,21 @@
gzip -k onos-voltha-startup-combined.log
rm onos-voltha-startup-combined.log
"""
- // forward ONOS and VOLTHA ports
- sh """
+ // forward ONOS and VOLTHA ports
+ sh('''
JENKINS_NODE_COOKIE="dontKillMe" _TAG=onos-port-forward /bin/bash -c "while true; do kubectl -n infra port-forward --address 0.0.0.0 service/voltha-infra-onos-classic-hs 8101:8101; done 2>&1 " &
JENKINS_NODE_COOKIE="dontKillMe" _TAG=onos-port-forward /bin/bash -c "while true; do kubectl -n infra port-forward --address 0.0.0.0 service/voltha-infra-onos-classic-hs 8181:8181; done 2>&1 " &
JENKINS_NODE_COOKIE="dontKillMe" _TAG=port-forward-voltha-api /bin/bash -c "while true; do kubectl -n voltha port-forward --address 0.0.0.0 service/voltha-voltha-api 55555:55555; done 2>&1 " &
- """
- sh """
+ ''')
+ sh('''
sshpass -e ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 8101 karaf@127.0.0.1 log:set DEBUG org.opencord
- """
+ ''')
+ }
}
- }
- stage('Test - '+ name) {
- timeout(75) {
- sh """
+
+ stage('Test - ' + name) {
+ timeout(75) {
+ sh """
ROBOT_LOGS_DIR="$WORKSPACE/RobotLogs/${name}"
mkdir -p \$ROBOT_LOGS_DIR
if [[ ${name} == 'onos-app-upgrade' ]]; then
@@ -201,27 +236,30 @@
# Run the specified tests
make -C $WORKSPACE/voltha-system-tests \$TARGET || true
"""
- // remove port-forwarding
- sh """
+ // remove port-forwarding
+ sh """
# remove orphaned port-forward from different namespaces
ps aux | grep port-forw | grep -v grep | awk '{print \$2}' | xargs --no-run-if-empty kill -9 || true
"""
- // collect pod details
- get_pods_info("$WORKSPACE/${name}")
- sh """
+ // collect pod details
+ get_pods_info("$WORKSPACE/${name}")
+ sh """
set +e
# collect logs collected in the Robot Framework StartLogging keyword
cd ${logsDir}
gzip *-combined.log || true
rm *-combined.log || true
"""
- helmTeardown(['infra', 'voltha'])
+ helmTeardown(['infra', 'voltha'])
+ }
}
- }
}
-def get_pods_info(dest) {
- // collect pod details, this is here in case of failure
- sh """
+
+// -----------------------------------------------------------------------
+// -----------------------------------------------------------------------
+void get_pods_info(dest) {
+ // collect pod details, this is here in case of failure
+ sh """
mkdir -p ${dest} || true
kubectl get pods --all-namespaces -o wide > ${dest}/pods.txt || true
kubectl get pods --all-namespaces -o jsonpath="{range .items[*].status.containerStatuses[*]}{.image}{'\\n'}" | sort | uniq | tee ${dest}/pod-images.txt || true
@@ -230,79 +268,116 @@
kubectl describe pods -n infra -l app=onos-classic > ${dest}/onos-pods-describe.txt
helm ls --all-namespaces > ${dest}/helm-charts.txt
"""
- sh '''
+ sh '''
# copy the ONOS logs directly from the container to avoid the color codes
printf '%s\\n' $(kubectl get pods -n infra -l app=onos-classic -o=jsonpath="{.items[*]['metadata.name']}") | xargs --no-run-if-empty -I# bash -c 'kubectl -n infra cp #:apache-karaf-4.2.14/data/log/karaf.log ''' + dest + '''/#.log' || true
'''
+ return
}
+
+// -----------------------------------------------------------------------
+// -----------------------------------------------------------------------
pipeline {
- /* no label, executor is determined by JJB */
- agent {
- label "${params.buildNode}"
- }
- options {
- timeout(time: 220, unit: 'MINUTES')
- }
- environment {
- PATH="$PATH:$WORKSPACE/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin"
- KUBECONFIG="$HOME/.kube/kind-config-voltha-minimal"
- SSHPASS="karaf"
- }
- stages{
- stage('Download Code') {
- steps {
- getVolthaCode([
- branch: "${branch}",
- volthaSystemTestsChange: "${volthaSystemTestsChange}",
- volthaHelmChartsChange: "${volthaHelmChartsChange}",
- ])
- }
+ /* no label, executor is determined by JJB */
+ agent {
+ label "${params.buildNode}"
}
- stage('Cleanup') {
- steps {
- // remove port-forwarding
- sh """
- # remove orphaned port-forward from different namespaces
- ps aux | grep port-forw | grep -v grep | awk '{print \$2}' | xargs --no-run-if-empty kill -9 || true
- """
- helmTeardown(['infra', 'voltha'])
- }
+
+ options {
+ timeout(time: 220, unit: 'MINUTES')
}
- stage('Create K8s Cluster') {
- steps {
- createKubernetesCluster([nodes: 3])
- }
+
+ environment {
+ PATH="$PATH:$WORKSPACE/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin"
+ KUBECONFIG="$HOME/.kube/kind-config-voltha-minimal"
+ SSHPASS="karaf"
}
- stage('Run Test') {
- steps {
- test_software_upgrade("onos-app-upgrade")
- test_software_upgrade("voltha-component-upgrade")
- test_software_upgrade("voltha-component-rolling-upgrade")
- test_software_upgrade("onu-software-upgrade")
- test_software_upgrade("onu-software-upgrade-omci-extended-msg")
- test_software_upgrade("onu-image-dwl-simultaneously")
- }
+
+ stages {
+ stage('Download Code') {
+ steps {
+ getVolthaCode([
+ branch: "${branch}",
+ volthaSystemTestsChange: "${volthaSystemTestsChange}",
+ volthaHelmChartsChange: "${volthaHelmChartsChange}",
+ ])
+ }
+ }
+
+ // -----------------------------------------------------------------------
+ // -----------------------------------------------------------------------
+ stage('Install Tools')
+ {
+ steps
+ {
+ script
+ {
+ String iam = getIam('Install Kind')
+ println("${iam}: ENTER")
+ installKind("$branch") // needed early by stage(Cleanup)
+ println("${iam}: LEAVE")
+ } // script
+ } // steps
+ } // stage
+
+ // -----------------------------------------------------------------------
+ // -----------------------------------------------------------------------
+ stage('Cleanup') {
+ steps {
+ // remove port-forwarding
+ sh(label : 'Remove port forwarding',
+ script : """
+if [[ \$(pgrep --count 'port-forw') -gt 0 ]]; then
+ pkill --uid "\$(id -u)" --echo --full 'port-forw'
+fi
+""")
+ helmTeardown(['infra', 'voltha'])
+ }
+ }
+
+ // -----------------------------------------------------------------------
+ // -----------------------------------------------------------------------
+ stage('Create K8s Cluster') {
+ steps {
+ createKubernetesCluster([nodes: 3])
+ }
+ }
+
+ // -----------------------------------------------------------------------
+ // -----------------------------------------------------------------------
+ stage('Run Test') {
+ steps {
+ test_software_upgrade('onos-app-upgrade')
+ test_software_upgrade('voltha-component-upgrade')
+ test_software_upgrade('voltha-component-rolling-upgrade')
+ test_software_upgrade('onu-software-upgrade')
+ test_software_upgrade('onu-software-upgrade-omci-extended-msg')
+ test_software_upgrade('onu-image-dwl-simultaneously')
+ }
+ }
}
- }
- post {
- aborted {
- get_pods_info("$WORKSPACE/failed")
- }
- failure {
- get_pods_info("$WORKSPACE/failed")
- }
- always {
- step([$class: 'RobotPublisher',
- disableArchiveOutput: false,
- logFileName: 'RobotLogs/*/log*.html',
- otherFiles: '',
- outputFileName: 'RobotLogs/*/output*.xml',
- outputPath: '.',
- passThreshold: 100,
- reportFileName: 'RobotLogs/*/report*.html',
- unstableThreshold: 0,
- onlyCritical: true]);
- archiveArtifacts artifacts: '*.log,**/*.log,**/*.gz,*.gz,*.txt,**/*.txt'
- }
- }
-}
+
+ // -----------------------------------------------------------------------
+ // -----------------------------------------------------------------------
+ post {
+ aborted {
+ get_pods_info("$WORKSPACE/failed")
+ }
+ failure {
+ get_pods_info("$WORKSPACE/failed")
+ }
+ always {
+ step([$class: 'RobotPublisher',
+ disableArchiveOutput: false,
+ logFileName: 'RobotLogs/*/log*.html',
+ otherFiles: '',
+ outputFileName: 'RobotLogs/*/output*.xml',
+ outputPath: '.',
+ passThreshold: 100,
+ reportFileName: 'RobotLogs/*/report*.html',
+ unstableThreshold: 0,
+ onlyCritical: true])
+ archiveArtifacts artifacts: '*.log,**/*.log,**/*.gz,*.gz,*.txt,**/*.txt'
+ } // always
+ } // post
+} // pipeline
diff --git a/jjb/pipeline/voltha/voltha-2.12/software-upgrades.groovy b/jjb/pipeline/voltha/voltha-2.12/software-upgrades.groovy
index 449e64a..3f15e7a 100755
--- a/jjb/pipeline/voltha/voltha-2.12/software-upgrades.groovy
+++ b/jjb/pipeline/voltha/voltha-2.12/software-upgrades.groovy
@@ -51,101 +51,105 @@
return(name)
}
+// -----------------------------------------------------------------------
// fetches the versions/tags of the voltha component
// returns the deployment version which is one less than the latest available tag of the repo, first voltha stack gets deployed using this;
// returns the test version which is the latest tag of the repo, the component upgrade gets tested on this.
// Note: if there is a major version change between deployment and test tags, then deployment tag will be same as test tag, i.e. both as latest.
+// -----------------------------------------------------------------------
def get_voltha_comp_versions(component, base_deploy_tag) {
- def comp_test_tag = sh (
- script: "git ls-remote --refs --tags https://github.com/opencord/${component} | cut --delimiter='/' --fields=3 | tr '-' '~' | sort --version-sort | tail --lines=1 | sed 's/v//'",
- returnStdout: true
+ def comp_test_tag = sh(
+ script: "git ls-remote --refs --tags https://github.com/opencord/${component} | cut --delimiter='/' --fields=3 | tr '-' '~' | sort --version-sort | tail --lines=1 | sed 's/v//'",
+ returnStdout: true
).trim()
- def comp_deploy_tag = sh (
- script: "git ls-remote --refs --tags https://github.com/opencord/${component} | cut --delimiter='/' --fields=3 | tr '-' '~' | sort --version-sort | tail --lines=2 | head -n 1 | sed 's/v//'",
- returnStdout: true
+ def comp_deploy_tag = sh(
+ script: "git ls-remote --refs --tags https://github.com/opencord/${component} | cut --delimiter='/' --fields=3 | tr '-' '~' | sort --version-sort | tail --lines=2 | head -n 1 | sed 's/v//'",
+ returnStdout: true
).trim()
def comp_deploy_major = comp_deploy_tag.substring(0, comp_deploy_tag.indexOf('.'))
def comp_test_major = comp_test_tag.substring(0, comp_test_tag.indexOf('.'))
- if ( "${comp_deploy_major.trim()}" != "${comp_test_major.trim()}") {
- comp_deploy_tag = comp_test_tag
+ if ("${comp_deploy_major.trim()}" != "${comp_test_major.trim()}") {
+ comp_deploy_tag = comp_test_tag
}
- if ( "${comp_test_tag.trim()}" == "${base_deploy_tag.trim()}") {
- comp_deploy_tag = comp_test_tag
- comp_test_tag = "master"
+ if ("${comp_test_tag.trim()}" == "${base_deploy_tag.trim()}") {
+ comp_deploy_tag = comp_test_tag
+ comp_test_tag = "master"
}
println "${component}: deploy_tag: ${comp_deploy_tag}, test_tag: ${comp_test_tag}"
return [comp_deploy_tag, comp_test_tag]
}
+// -----------------------------------------------------------------------
+// -----------------------------------------------------------------------
def test_software_upgrade(name) {
- def infraNamespace = "infra"
- def volthaNamespace = "voltha"
- def openolt_adapter_deploy_tag = ''
- def openolt_adapter_test_tag = ''
- def openonu_adapter_deploy_tag = ''
- def openonu_adapter_test_tag = ''
- def rw_core_deploy_tag = ''
- def rw_core_test_tag = ''
- def ofagent_deploy_tag = ''
- def ofagent_test_tag = ''
- def logsDir = "$WORKSPACE/${name}"
- stage('Deploy Voltha - '+ name) {
- timeout(10) {
- // start logging
- sh """
+ def infraNamespace = "infra"
+ def volthaNamespace = "voltha"
+ def openolt_adapter_deploy_tag = ''
+ def openolt_adapter_test_tag = ''
+ def openonu_adapter_deploy_tag = ''
+ def openonu_adapter_test_tag = ''
+ def rw_core_deploy_tag = ''
+ def rw_core_test_tag = ''
+ def ofagent_deploy_tag = ''
+ def ofagent_test_tag = ''
+ def logsDir = "$WORKSPACE/${name}"
+ stage('Deploy Voltha - ' + name) {
+ timeout(10) {
+ // start logging
+ sh """
rm -rf ${logsDir} || true
mkdir -p ${logsDir}
_TAG=kail-${name} kail -n ${infraNamespace} -n ${volthaNamespace} > ${logsDir}/onos-voltha-startup-combined.log &
"""
- String extraHelmFlags = extraHelmFlags.trim()
- if ("${name}" == "onos-app-upgrade" || "${name}" == "onu-software-upgrade" || "${name}" == "onu-software-upgrade-omci-extended-msg" || "${name}" == "voltha-component-upgrade" || "${name}" == "voltha-component-rolling-upgrade") {
- extraHelmFlags = " --set global.log_level=${logLevel.toUpperCase()},onu=1,pon=1 --set onos-classic.replicas=3,onos-classic.atomix.replicas=3 " + extraHelmFlags
- }
- if ("${name}" == "onu-software-upgrade" || "${name}" == "onu-software-upgrade-omci-extended-msg") {
- extraHelmFlags = " --set global.extended_omci_support.enabled=true " + extraHelmFlags
- }
- if ("${name}" == "onu-software-upgrade-omci-extended-msg") {
- extraHelmFlags = " --set omccVersion=180 " + extraHelmFlags
- }
- if ("${name}" == "onu-image-dwl-simultaneously") {
- extraHelmFlags = " --set global.log_level=${logLevel.toUpperCase()},onu=2,pon=2 --set onos-classic.replicas=3,onos-classic.atomix.replicas=3 " + extraHelmFlags
- }
- if ("${name}" == "onos-app-upgrade" || "${name}" == "onu-software-upgrade" || "${name}" == "onu-software-upgrade-omci-extended-msg" || "${name}" == "onu-image-dwl-simultaneously") {
- extraHelmFlags = " --set global.image_tag=master --set onos-classic.image.tag=master " + extraHelmFlags
- }
- if ("${name}" == "voltha-component-upgrade" || "${name}" == "voltha-component-rolling-upgrade") {
- extraHelmFlags = " --set images.onos_config_loader.tag=master-onos-config-loader --set onos-classic.image.tag=master " + extraHelmFlags
- }
- extraHelmFlags += " --set onos-classic.onosSshPort=30115 --set onos-classic.onosApiPort=30120 "
- extraHelmFlags += " --set voltha.onos_classic.replicas=3"
- //ONOS custom image handling
- if ( onosImg.trim() != '' ) {
- String[] split;
- onosImg = onosImg.trim()
- split = onosImg.split(':')
- extraHelmFlags += " --set onos-classic.image.repository=" + split[0] +",onos-classic.image.tag=" + split[1] + " "
- }
- Integer olts = 1
- if ("${name}" == "onu-image-dwl-simultaneously") {
- olts = 2
- }
- if ("${name}" == "voltha-component-upgrade" || "${name}" == "voltha-component-rolling-upgrade") {
- // fetch voltha components versions/tags
- (openolt_adapter_deploy_tag, openolt_adapter_test_tag) = get_voltha_comp_versions("voltha-openolt-adapter", openoltAdapterDeployBaseTag.trim())
- extraHelmFlags += " --set voltha-adapter-openolt.images.adapter_open_olt.tag=${openolt_adapter_deploy_tag} "
- (openonu_adapter_deploy_tag, openonu_adapter_test_tag) = get_voltha_comp_versions("voltha-openonu-adapter-go", openonuAdapterDeployBaseTag.trim())
- extraHelmFlags += " --set voltha-adapter-openonu.images.adapter_open_onu_go.tag=${openonu_adapter_deploy_tag} "
- (rw_core_deploy_tag, rw_core_test_tag) = get_voltha_comp_versions("voltha-go", rwCoreDeployBaseTag.trim())
- extraHelmFlags += " --set voltha.images.rw_core.tag=${rw_core_deploy_tag} "
- (ofagent_deploy_tag, ofagent_test_tag) = get_voltha_comp_versions("ofagent-go", ofagentDeployBaseTag.trim())
- extraHelmFlags += " --set voltha.images.ofagent.tag=${ofagent_deploy_tag} "
- }
- def localCharts = false
- // Currently only testing with ATT workflow
- // TODO: Support for other workflows
- volthaDeploy([bbsimReplica: olts.toInteger(), workflow: 'att', extraHelmFlags: extraHelmFlags, localCharts: localCharts])
- // stop logging
- sh """
+ def extraHelmFlags = extraHelmFlags.trim()
+ if ("${name}" == "onos-app-upgrade" || "${name}" == "onu-software-upgrade" || "${name}" == "onu-software-upgrade-omci-extended-msg" || "${name}" == "voltha-component-upgrade" || "${name}" == "voltha-component-rolling-upgrade") {
+ extraHelmFlags = " --set global.log_level=${logLevel.toUpperCase()},onu=1,pon=1 --set onos-classic.replicas=3,onos-classic.atomix.replicas=3 " + extraHelmFlags
+ }
+ if ("${name}" == "onu-software-upgrade" || "${name}" == "onu-software-upgrade-omci-extended-msg") {
+ extraHelmFlags = " --set global.extended_omci_support.enabled=true " + extraHelmFlags
+ }
+ if ("${name}" == "onu-software-upgrade-omci-extended-msg") {
+ extraHelmFlags = " --set omccVersion=180 " + extraHelmFlags
+ }
+ if ("${name}" == "onu-image-dwl-simultaneously") {
+ extraHelmFlags = " --set global.log_level=${logLevel.toUpperCase()},onu=2,pon=2 --set onos-classic.replicas=3,onos-classic.atomix.replicas=3 " + extraHelmFlags
+ }
+ if ("${name}" == "onos-app-upgrade" || "${name}" == "onu-software-upgrade" || "${name}" == "onu-software-upgrade-omci-extended-msg" || "${name}" == "onu-image-dwl-simultaneously") {
+ extraHelmFlags = " --set global.image_tag=master --set onos-classic.image.tag=master " + extraHelmFlags
+ }
+ if ("${name}" == "voltha-component-upgrade" || "${name}" == "voltha-component-rolling-upgrade") {
+ extraHelmFlags = " --set images.onos_config_loader.tag=master-onos-config-loader --set onos-classic.image.tag=master " + extraHelmFlags
+ }
+ extraHelmFlags += " --set onos-classic.onosSshPort=30115 --set onos-classic.onosApiPort=30120 "
+ extraHelmFlags += " --set voltha.onos_classic.replicas=3"
+ //ONOS custom image handling
+ if ( onosImg.trim() != '' ) {
+ String[] split;
+ onosImg = onosImg.trim()
+ split = onosImg.split(':')
+ extraHelmFlags += " --set onos-classic.image.repository=" + split[0] +",onos-classic.image.tag=" + split[1] + " "
+ }
+ Integer olts = 1
+ if ("${name}" == 'onu-image-dwl-simultaneously') {
+ olts = 2
+ }
+ if ("${name}" == 'voltha-component-upgrade' || "${name}" == 'voltha-component-rolling-upgrade') {
+ // fetch voltha components versions/tags
+ (openolt_adapter_deploy_tag, openolt_adapter_test_tag) = get_voltha_comp_versions('voltha-openolt-adapter', openoltAdapterDeployBaseTag.trim())
+ extraHelmFlags += " --set voltha-adapter-openolt.images.adapter_open_olt.tag=${openolt_adapter_deploy_tag} "
+ (openonu_adapter_deploy_tag, openonu_adapter_test_tag) = get_voltha_comp_versions('voltha-openonu-adapter-go', openonuAdapterDeployBaseTag.trim())
+ extraHelmFlags += " --set voltha-adapter-openonu.images.adapter_open_onu_go.tag=${openonu_adapter_deploy_tag} "
+ (rw_core_deploy_tag, rw_core_test_tag) = get_voltha_comp_versions('voltha-go', rwCoreDeployBaseTag.trim())
+ extraHelmFlags += " --set voltha.images.rw_core.tag=${rw_core_deploy_tag} "
+ (ofagent_deploy_tag, ofagent_test_tag) = get_voltha_comp_versions('ofagent-go', ofagentDeployBaseTag.trim())
+ extraHelmFlags += " --set voltha.images.ofagent.tag=${ofagent_deploy_tag} "
+ }
+ def localCharts = false
+ // Currently only testing with ATT workflow
+ // TODO: Support for other workflows
+ volthaDeploy([bbsimReplica: olts.toInteger(), workflow: 'att', extraHelmFlags: extraHelmFlags, localCharts: localCharts])
+ // stop logging
+ sh """
P_IDS="\$(ps e -ww -A | grep "_TAG=kail-${name}" | grep -v grep | awk '{print \$1}')"
if [ -n "\$P_IDS" ]; then
echo \$P_IDS
@@ -157,20 +161,21 @@
gzip -k onos-voltha-startup-combined.log
rm onos-voltha-startup-combined.log
"""
- // forward ONOS and VOLTHA ports
- sh('''
+ // forward ONOS and VOLTHA ports
+ sh('''
JENKINS_NODE_COOKIE="dontKillMe" _TAG=onos-port-forward /bin/bash -c "while true; do kubectl -n infra port-forward --address 0.0.0.0 service/voltha-infra-onos-classic-hs 8101:8101; done 2>&1 " &
JENKINS_NODE_COOKIE="dontKillMe" _TAG=onos-port-forward /bin/bash -c "while true; do kubectl -n infra port-forward --address 0.0.0.0 service/voltha-infra-onos-classic-hs 8181:8181; done 2>&1 " &
JENKINS_NODE_COOKIE="dontKillMe" _TAG=port-forward-voltha-api /bin/bash -c "while true; do kubectl -n voltha port-forward --address 0.0.0.0 service/voltha-voltha-api 55555:55555; done 2>&1 " &
''')
- sh """
+ sh('''
sshpass -e ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 8101 karaf@127.0.0.1 log:set DEBUG org.opencord
- """
+ ''')
+ }
}
- }
- stage('Test - '+ name) {
- timeout(75) {
- sh """
+
+ stage('Test - ' + name) {
+ timeout(75) {
+ sh """
ROBOT_LOGS_DIR="$WORKSPACE/RobotLogs/${name}"
mkdir -p \$ROBOT_LOGS_DIR
if [[ ${name} == 'onos-app-upgrade' ]]; then
@@ -231,27 +236,30 @@
# Run the specified tests
make -C $WORKSPACE/voltha-system-tests \$TARGET || true
"""
- // remove port-forwarding
- sh """
+ // remove port-forwarding
+ sh """
# remove orphaned port-forward from different namespaces
ps aux | grep port-forw | grep -v grep | awk '{print \$2}' | xargs --no-run-if-empty kill -9 || true
"""
- // collect pod details
- get_pods_info("$WORKSPACE/${name}")
- sh """
+ // collect pod details
+ get_pods_info("$WORKSPACE/${name}")
+ sh """
set +e
# collect logs collected in the Robot Framework StartLogging keyword
cd ${logsDir}
gzip *-combined.log || true
rm *-combined.log || true
"""
- helmTeardown(['infra', 'voltha'])
+ helmTeardown(['infra', 'voltha'])
+ }
}
- }
}
-def get_pods_info(dest) {
- // collect pod details, this is here in case of failure
- sh """
+
+// -----------------------------------------------------------------------
+// -----------------------------------------------------------------------
+void get_pods_info(dest) {
+ // collect pod details, this is here in case of failure
+ sh """
mkdir -p ${dest} || true
kubectl get pods --all-namespaces -o wide > ${dest}/pods.txt || true
kubectl get pods --all-namespaces -o jsonpath="{range .items[*].status.containerStatuses[*]}{.image}{'\\n'}" | sort | uniq | tee ${dest}/pod-images.txt || true
@@ -260,115 +268,116 @@
kubectl describe pods -n infra -l app=onos-classic > ${dest}/onos-pods-describe.txt
helm ls --all-namespaces > ${dest}/helm-charts.txt
"""
- sh '''
+ sh '''
# copy the ONOS logs directly from the container to avoid the color codes
printf '%s\\n' $(kubectl get pods -n infra -l app=onos-classic -o=jsonpath="{.items[*]['metadata.name']}") | xargs --no-run-if-empty -I# bash -c 'kubectl -n infra cp #:apache-karaf-4.2.14/data/log/karaf.log ''' + dest + '''/#.log' || true
'''
+ return
}
+
+// -----------------------------------------------------------------------
+// -----------------------------------------------------------------------
pipeline {
- /* no label, executor is determined by JJB */
- agent {
- label "${params.buildNode}"
- }
- options {
- timeout(time: 220, unit: 'MINUTES')
- }
- environment {
- PATH="$PATH:$WORKSPACE/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin"
- KUBECONFIG="$HOME/.kube/kind-config-voltha-minimal"
- SSHPASS="karaf"
- }
- stages{
- stage('Download Code') {
- steps {
- getVolthaCode([
- branch: "${branch}",
- volthaSystemTestsChange: "${volthaSystemTestsChange}",
- volthaHelmChartsChange: "${volthaHelmChartsChange}",
- ])
- }
+ /* no label, executor is determined by JJB */
+ agent {
+ label "${params.buildNode}"
}
- // -----------------------------------------------------------------------
- // -----------------------------------------------------------------------
- stage('Install Tools')
- {
- steps
+ options {
+ timeout(time: 220, unit: 'MINUTES')
+ }
+
+ environment {
+ PATH="$PATH:$WORKSPACE/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin"
+ KUBECONFIG="$HOME/.kube/kind-config-voltha-minimal"
+ SSHPASS="karaf"
+ }
+
+ stages {
+ stage('Download Code') {
+ steps {
+ getVolthaCode([
+ branch: "${branch}",
+ volthaSystemTestsChange: "${volthaSystemTestsChange}",
+ volthaHelmChartsChange: "${volthaHelmChartsChange}",
+ ])
+ }
+ }
+
+ // -----------------------------------------------------------------------
+ // -----------------------------------------------------------------------
+ stage('Install Tools')
{
- script
+ steps
{
- String iam = getIam('Install Kind')
- println("${iam}: ENTER")
- installKind("$branch") // needed early by stage(Cleanup)
- println("${iam}: LEAVE")
- } // script
- } // steps
- } // stage
+ script
+ {
+ String iam = getIam('Install Kind')
+ println("${iam}: ENTER")
+ installKind("$branch") // needed early by stage(Cleanup)
+ println("${iam}: LEAVE")
+ } // script
+ } // steps
+ } // stage
+
+ // -----------------------------------------------------------------------
+ // -----------------------------------------------------------------------
+ stage('Cleanup') {
+ steps {
+ // remove port-forwarding
+ sh(label : 'Remove port forwarding',
+ script : """
+if [[ \$(pgrep --count 'port-forw') -gt 0 ]]; then
+ pkill --uid "\$(id -u)" --echo --full 'port-forw'
+fi
+""")
+ helmTeardown(['infra', 'voltha'])
+ }
+ }
+
+ // -----------------------------------------------------------------------
+ // -----------------------------------------------------------------------
+ stage('Create K8s Cluster') {
+ steps {
+ createKubernetesCluster([nodes: 3])
+ }
+ }
+
+ // -----------------------------------------------------------------------
+ // -----------------------------------------------------------------------
+ stage('Run Test') {
+ steps {
+ test_software_upgrade('onos-app-upgrade')
+ test_software_upgrade('voltha-component-upgrade')
+ test_software_upgrade('voltha-component-rolling-upgrade')
+ test_software_upgrade('onu-software-upgrade')
+ test_software_upgrade('onu-software-upgrade-omci-extended-msg')
+ test_software_upgrade('onu-image-dwl-simultaneously')
+ }
+ }
+ }
// -----------------------------------------------------------------------
// -----------------------------------------------------------------------
- stage('Cleanup') {
- steps {
-
- script {
- println('''
-** -----------------------------------------------------------------------
-** Raw process listing
-** -----------------------------------------------------------------------
-''')
- sh(''' ps faaux ''')
-
- println('''
-** -----------------------------------------------------------------------
-** pgrep --list-full port
-** -----------------------------------------------------------------------
-''')
- sh(''' set +euo pipefail && pgrep --list-full 'port' ''')
- }
-
- // remove port-forwarding
- sh """
- # remove orphaned port-forward from different namespaces
- ps aux | grep port-forw | grep -v grep | awk '{print \$2}' | xargs --no-run-if-empty kill -9 || true
- """
- helmTeardown(['infra', 'voltha'])
- }
- }
- stage('Create K8s Cluster') {
- steps {
- createKubernetesCluster([nodes: 3])
- }
- }
- stage('Run Test') {
- steps {
- test_software_upgrade("onos-app-upgrade")
- test_software_upgrade("voltha-component-upgrade")
- test_software_upgrade("voltha-component-rolling-upgrade")
- test_software_upgrade("onu-software-upgrade")
- test_software_upgrade("onu-software-upgrade-omci-extended-msg")
- test_software_upgrade("onu-image-dwl-simultaneously")
- }
- }
- }
- post {
- aborted {
- get_pods_info("$WORKSPACE/failed")
- }
- failure {
- get_pods_info("$WORKSPACE/failed")
- }
- always {
- step([$class: 'RobotPublisher',
- disableArchiveOutput: false,
- logFileName: 'RobotLogs/*/log*.html',
- otherFiles: '',
- outputFileName: 'RobotLogs/*/output*.xml',
- outputPath: '.',
- passThreshold: 100,
- reportFileName: 'RobotLogs/*/report*.html',
- unstableThreshold: 0,
- onlyCritical: true]);
- archiveArtifacts artifacts: '*.log,**/*.log,**/*.gz,*.gz,*.txt,**/*.txt'
- }
- }
-}
+ post {
+ aborted {
+ get_pods_info("$WORKSPACE/failed")
+ }
+ failure {
+ get_pods_info("$WORKSPACE/failed")
+ }
+ always {
+ step([$class: 'RobotPublisher',
+ disableArchiveOutput: false,
+ logFileName: 'RobotLogs/*/log*.html',
+ otherFiles: '',
+ outputFileName: 'RobotLogs/*/output*.xml',
+ outputPath: '.',
+ passThreshold: 100,
+ reportFileName: 'RobotLogs/*/report*.html',
+ unstableThreshold: 0,
+ onlyCritical: true])
+ archiveArtifacts artifacts: '*.log,**/*.log,**/*.gz,*.gz,*.txt,**/*.txt'
+ } // always
+ } // post
+} // pipeline
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index 1c2715b..3dada3d 100755
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -1970,21 +1970,6 @@
logging: true
timeout: 230
- # -----------------------------------------------------------------------
- # -----------------------------------------------------------------------
- - 'voltha-periodic-test':
- name: 'periodic-voltha-dt-fttb-test-bbsim'
- build-node: 'ubuntu18.04-basebuild-4c-8g'
- code-branch: 'master'
- time-trigger: "H H/23 * * *"
- extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF --set onu=2'
- testTargets: |
- - target: sanity-kind-dt-fttb
- workflow: dt-fttb
- flags: ""
- teardown: true
- logging: true
-
- 'voltha-periodic-test':
name: 'periodic-voltha-tim-multiple-olts-test-bbsim'
code-branch: 'master'
diff --git a/jjb/voltha-e2e/master.yaml b/jjb/voltha-e2e/master.yaml
index 1398f29..f3baff1 100644
--- a/jjb/voltha-e2e/master.yaml
+++ b/jjb/voltha-e2e/master.yaml
@@ -168,4 +168,20 @@
teardown: false
logging: true
+ # -----------------------------------------------------------------------
+ # md5sum(master): 6a1a43e203f8b5d4ad0c3d9f73116045
+ # -----------------------------------------------------------------------
+ - 'voltha-periodic-test':
+ name: 'periodic-voltha-dt-fttb-test-bbsim-master'
+ build-node: 'ubuntu18.04-basebuild-4c-8g'
+ code-branch: 'master'
+ time-trigger: "H H/23 * * *"
+ extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF --set onu=2'
+ testTargets: |
+ - target: sanity-kind-dt-fttb
+ workflow: dt-fttb
+ flags: ""
+ teardown: true
+ logging: true
+
# [EOF]
diff --git a/jjb/voltha-e2e/voltha-2.12.yaml b/jjb/voltha-e2e/voltha-2.12.yaml
index 743e171..8d10ae0 100644
--- a/jjb/voltha-e2e/voltha-2.12.yaml
+++ b/jjb/voltha-e2e/voltha-2.12.yaml
@@ -173,5 +173,21 @@
flags: ""
teardown: false
logging: true
+
+ # -----------------------------------------------------------------------
+ # md5sum(master): 6a1a43e203f8b5d4ad0c3d9f73116045
+ # -----------------------------------------------------------------------
+ - 'voltha-periodic-test':
+ name: 'periodic-voltha-dt-fttb-test-bbsim-2.12'
+ build-node: 'ubuntu18.04-basebuild-4c-8g'
+ code-branch: 'VOLTHA-2.12'
+ time-trigger: "H H/23 * * *"
+ extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF --set onu=2'
+ testTargets: |
+ - target: sanity-kind-dt-fttb
+ workflow: dt-fttb
+ flags: ""
+ teardown: true
+ logging: true
# [EOF]