Merge "Fixing kind-voltha test for 2.7 branch"
diff --git a/jjb/pipeline/voltha/master/periodic-bbsim-tests.groovy b/jjb/pipeline/voltha/master/periodic-bbsim-tests.groovy
index 42c4b29..ebacea8 100644
--- a/jjb/pipeline/voltha/master/periodic-bbsim-tests.groovy
+++ b/jjb/pipeline/voltha/master/periodic-bbsim-tests.groovy
@@ -64,6 +64,11 @@
" --set onos-classic.onosApiPort=30120 " +
" --set onos-classic.onosOfPort=31653 " +
" --set onos-classic.individualOpenFlowNodePorts=true " + testSpecificHelmFlags
+
+ if (gerritProject != "") {
+ localHelmFlags = "${localHelmFlags} " + getVolthaImageFlags("${gerritProject}")
+ }
+
volthaDeploy([
infraNamespace: infraNamespace,
volthaNamespace: volthaNamespace,
@@ -173,6 +178,19 @@
])
}
}
+ stage('Build patch') {
+ // build the patch only if gerritProject is specified
+ when {
+ expression {
+ return !gerritProject.isEmpty()
+ }
+ }
+ steps {
+ // NOTE that the correct patch has already been checked out
+ // during the getVolthaCode step
+ buildVolthaComponent("${gerritProject}")
+ }
+ }
stage('Create K8s Cluster') {
steps {
script {
@@ -185,6 +203,16 @@
}
}
}
+ stage('Load image in kind nodes') {
+ when {
+ expression {
+ return !gerritProject.isEmpty()
+ }
+ }
+ steps {
+ loadToKind()
+ }
+ }
stage('Parse and execute tests') {
steps {
script {
diff --git a/jjb/verify/opendevice-manager.yaml b/jjb/verify/opendevice-manager.yaml
index f3ee4b4..14f09ae 100644
--- a/jjb/verify/opendevice-manager.yaml
+++ b/jjb/verify/opendevice-manager.yaml
@@ -8,6 +8,8 @@
jobs:
- 'verify-opendevice-manager-jobs':
branch-regexp: '{all-branches-regexp}'
+ - 'publish-voltha-opendevice-manager-jobs':
+ branch-regexp: '{all-branches-regexp}'
- job-group:
name: 'verify-opendevice-manager-jobs'
@@ -20,3 +22,13 @@
# opendm-agent uses gtest which outputs in xunit format
junit-allow-empty-results: true
xunit-skip-if-no-test-files: false
+
+- job-group:
+ name: 'publish-voltha-opendevice-manager-jobs'
+ jobs:
+ - 'docker-publish':
+ build-timeout: 30
+ docker-repo: 'voltha'
+ dependency-jobs: 'version-tag'
+
+
diff --git a/jjb/voltha-test/voltha.yaml b/jjb/voltha-test/voltha.yaml
index 658d9db..12a4a36 100644
--- a/jjb/voltha-test/voltha.yaml
+++ b/jjb/voltha-test/voltha.yaml
@@ -371,7 +371,7 @@
pipeline-script: 'voltha-physical-soak-dt-tests.groovy'
time-trigger: "H H */3 * *"
- # Berlin pod with olt/onu - master versions timer based job , two OLTs
+ # Certification (Radisys) pod with olt/onu - master versions timer based job , two OLTs
- 'build_voltha_pod_release_timer':
build-node: 'menlo-certification-pod'
config-pod: 'menlo-certification-pod-radisys-gpon'
@@ -382,7 +382,7 @@
profile: '1T8GEM-unencrypted'
time: '1'
- # Berlin POD test job - master versions: uses tech profile on voltha branch
+ # Certification (Radisys) POD test job - master versions: uses tech profile on voltha branch
- 'build_voltha_pod_test':
build-node: 'menlo-certification-pod'
config-pod: 'menlo-certification-pod-radisys-gpon'