Merge "Testing shared libraries in ci-management repo"
diff --git a/jjb/cord-test/voltha.yaml b/jjb/cord-test/voltha.yaml
index 6e3d996..e1e2b17 100644
--- a/jjb/cord-test/voltha.yaml
+++ b/jjb/cord-test/voltha.yaml
@@ -610,7 +610,7 @@
configurePod: true
profile: '1T8GEM'
reinstall-olt: false
- openoltAdapterChart: '/home/community/adtran-2021-01-19/voltha-adapter-adtran-olt'
+ openoltAdapterChart: '/home/community/adtran-2021-01-29/voltha-adapter-adtran-olt'
time: '9'
diff --git a/jjb/omec-ci.yaml b/jjb/omec-ci.yaml
index 674ed2a..fe03e2d 100644
--- a/jjb/omec-ci.yaml
+++ b/jjb/omec-ci.yaml
@@ -1116,6 +1116,11 @@
default: '{registry-proxy}/upf-epc-pfcpiface:master-latest'
description: 'Docker image for pfcpiface. Leave empty to use default helm-charts value'
+ - string:
+ name: maintainers
+ default: 'you@opennetworking.org'
+ description: "The person that sould be notified if this job fails"
+
concurrent: false
triggers:
diff --git a/jjb/pipeline/voltha-dt-physical-build-and-tests.groovy b/jjb/pipeline/voltha-dt-physical-build-and-tests.groovy
index 8b74eb6..42e253c 100644
--- a/jjb/pipeline/voltha-dt-physical-build-and-tests.groovy
+++ b/jjb/pipeline/voltha-dt-physical-build-and-tests.groovy
@@ -196,6 +196,8 @@
IMAGES="adapter_open_olt "
elif [ "${gerritProject}" = "voltha-openonu-adapter" ]; then
IMAGES="adapter_open_onu "
+ elif [ "${gerritProject}" = "voltha-openonu-adapter-go" ]; then
+ IMAGES="adapter_open_onu_go "
elif [ "${gerritProject}" = "voltha-api-server" ]; then
IMAGES="afrouter afrouterd "
else
diff --git a/jjb/pipeline/voltha-openonu-go-test-bbsim.groovy b/jjb/pipeline/voltha-openonu-go-test-bbsim.groovy
index 7e6c688..f7e2b60 100755
--- a/jjb/pipeline/voltha-openonu-go-test-bbsim.groovy
+++ b/jjb/pipeline/voltha-openonu-go-test-bbsim.groovy
@@ -23,7 +23,7 @@
label "${params.buildNode}"
}
options {
- timeout(time: 115, unit: 'MINUTES')
+ timeout(time: 130, unit: 'MINUTES')
}
environment {
KUBECONFIG="$HOME/.kube/kind-config-voltha-minimal"
@@ -280,7 +280,7 @@
export BBSIM_CFG="configs/bbsim-sadis-dt.yaml"
# start logging
- mkdir -p $WORKSPACE/dt
+ mkdir -p $WORKSPACE/reconciledt
_TAG=kail-reconcile-dt kail -n voltha -n default > $WORKSPACE/reconciledt/onos-voltha-combined.log &
DEPLOY_K8S=n ./voltha up
@@ -334,7 +334,7 @@
fi
# start logging
- mkdir -p $WORKSPACE/att
+ mkdir -p $WORKSPACE/reconcileatt
_TAG=kail-reconcile-att kail -n voltha -n default > $WORKSPACE/reconcileatt/onos-voltha-combined.log &
DEPLOY_K8S=n ./voltha up
@@ -382,7 +382,7 @@
export BBSIM_CFG="configs/bbsim-sadis-tt.yaml"
# start logging
- mkdir -p $WORKSPACE/tt
+ mkdir -p $WORKSPACE/reconcilett
_TAG=kail-reconcile-tt kail -n voltha -n default > $WORKSPACE/reconcilett/onos-voltha-combined.log &
DEPLOY_K8S=n ./voltha up
diff --git a/jjb/pipeline/voltha-openonu-go-tests.groovy b/jjb/pipeline/voltha-openonu-go-tests.groovy
index 27daa51..e86d61f 100755
--- a/jjb/pipeline/voltha-openonu-go-tests.groovy
+++ b/jjb/pipeline/voltha-openonu-go-tests.groovy
@@ -229,7 +229,10 @@
mkdir -p $ROBOT_LOGS_DIR/1t8gem
export ROBOT_MISC_ARGS="-d $ROBOT_LOGS_DIR"
export TARGET_1T8GEM=1t8gem-openonu-go-adapter-test
- export NAME=voltha_voltha
+
+ if [ "${branch}" != "voltha-2.6" ]; then
+ export NAME=voltha_voltha
+ fi
make -C $WORKSPACE/voltha-system-tests \$TARGET_1T8GEM || true
diff --git a/jjb/pipeline/voltha-physical-build-and-tests.groovy b/jjb/pipeline/voltha-physical-build-and-tests.groovy
index 306a426..f72b15d 100644
--- a/jjb/pipeline/voltha-physical-build-and-tests.groovy
+++ b/jjb/pipeline/voltha-physical-build-and-tests.groovy
@@ -192,6 +192,8 @@
IMAGES="adapter_open_olt "
elif [ "${gerritProject}" = "voltha-openonu-adapter" ]; then
IMAGES="adapter_open_onu "
+ elif [ "${gerritProject}" = "voltha-openonu-adapter-go" ]; then
+ IMAGES="adapter_open_onu_go "
elif [ "${gerritProject}" = "voltha-api-server" ]; then
IMAGES="afrouter afrouterd "
else
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index 5cb86b9..91b4ec7 100755
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -572,7 +572,7 @@
approval-value: '+2'
projects:
- project-compare-type: REG_EXP
- project-pattern: '^(voltha-openolt-adapter|voltha-openonu-adapter|voltha-go)$'
+ project-pattern: '^(voltha-openolt-adapter|voltha-openonu-adapter|voltha-openonu-adapter-go|voltha-go)$'
branches:
- branch-compare-type: REG_EXP
branch-pattern: '{all-branches-regexp}'
@@ -717,7 +717,7 @@
comment-contains-value: '^{trigger-string} with delay$'
projects:
- project-compare-type: REG_EXP
- project-pattern: '^(voltha-go|voltha-openolt-adapter|voltha-openonu-adapter|voltha-api-server|voltha-system-tests|ofagent-py|ofagent-go|voltha-onos|kind-voltha|voltha-helm-charts)$'
+ project-pattern: '^(voltha-go|voltha-openolt-adapter|voltha-openonu-adapter|voltha-openonu-adapter-go|voltha-api-server|voltha-system-tests|ofagent-py|ofagent-go|voltha-onos|kind-voltha|voltha-helm-charts)$'
branches:
- branch-compare-type: REG_EXP
branch-pattern: '{all-branches-regexp}'