Merge "[VOL-3820] DMI tests HW Pipeline"
diff --git a/jjb/pipeline/omec-container-remote.groovy b/jjb/pipeline/omec-container-remote.groovy
index 81c3c72..d70e0e8 100644
--- a/jjb/pipeline/omec-container-remote.groovy
+++ b/jjb/pipeline/omec-container-remote.groovy
@@ -22,8 +22,10 @@
steps {
withCredentials([string(credentialsId: 'aether-jenkins-remote-trigger-token-omec', variable: 'token')]) {
script {
- def handle = triggerRemoteJob job: "${params.project}_premerge_${params.pod}_4g_bess",
+ def handle = triggerRemoteJob job: "${params.project}_premerge_${params.pod}_4g_bess_${params.ghprbTargetBranch}",
parameters: """
+ sdcore_version=${params.ghprbTargetBranch}
+ aether_version=${params.ghprbTargetBranch}
ghprbTargetBranch=${params.ghprbTargetBranch}
ghprbPullId=${params.ghprbPullId}
ghprbActualCommit=${params.ghprbActualCommit}
@@ -40,7 +42,7 @@
always {
// Copy artifacts from the remote job dir (make sure both jobs run on the same node)
sh """
- cp -r ../${params.project}_premerge_${params.pod}_4g_bess/* ./
+ cp -r ../${params.project}_premerge_${params.pod}_4g_bess_${params.ghprbTargetBranch}/* ./
"""
archiveArtifacts artifacts: "**/*.*", allowEmptyArchive: true
}
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 680ac5d..5039890 100644
--- a/jjb/pipeline/voltha/master/voltha-physical-soak-dt-tests.groovy
+++ b/jjb/pipeline/voltha/master/voltha-physical-soak-dt-tests.groovy
@@ -121,6 +121,14 @@
voltctl log level set WARN adapter-open-olt#github.com/opencord/voltha-lib-go/v3/pkg/kafka
fi
"""
+ 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
+ """
}
}
@@ -232,8 +240,10 @@
source ./vst_venv/bin/activate || true
sleep 60 # we have to wait for prometheus to collect all the information
python scripts/sizing.py -o $WORKSPACE/plots -a 0.0.0.0:31301 -n ${volthaNamespace} -s 3600 || true
+ # Collect memory consumption of voltha pods once all the tests are complete
+ python scripts/mem_consumption.py -o $WORKSPACE/voltha-pods-mem-consumption -a 0.0.0.0:31301 -n ${volthaNamespace} || true
"""
- archiveArtifacts artifacts: '**/*.log,**/*.gz,**/*.tgz,*.txt,pods/*.txt,plots/*'
+ archiveArtifacts artifacts: '**/*.log,**/*.gz,**/*.tgz,*.txt,pods/*.txt,plots/*,voltha-pods-mem-consumption/*'
}
}
}
diff --git a/jjb/pipeline/voltha/master/voltha-scale-test.groovy b/jjb/pipeline/voltha/master/voltha-scale-test.groovy
index 34c7952..6ec2fe3 100644
--- a/jjb/pipeline/voltha/master/voltha-scale-test.groovy
+++ b/jjb/pipeline/voltha/master/voltha-scale-test.groovy
@@ -465,7 +465,7 @@
-v withEapol:${withEapol} \
-v withDhcp:${withDhcp} \
-v withIgmp:${withIgmp} \
- -v withMaclearning: ${withMaclearning} \
+ -v withMaclearning:${withMaclearning} \
--noncritical non-critical \
-e onu-upgrade -e igmp -e teardown "