Merge "Missing targets for reconcile tests in multiple OLTs scenario Precondition for this patch is patch: https://gerrit.opencord.org/c/voltha-system-tests/+/23661 When reconcile tests were introduced for muliple olt scenario it was not noticed there are no targets for. All tests are running in a single onu mode. That means only the first onu of the first olt was checked. With introduction of the new targets requirements of multiple OLT scenario will be full filled."
diff --git a/jjb/pipeline/voltha-openonu-go-test-bbsim.groovy b/jjb/pipeline/voltha-openonu-go-test-bbsim.groovy
index 0b73029..7842559 100755
--- a/jjb/pipeline/voltha-openonu-go-test-bbsim.groovy
+++ b/jjb/pipeline/voltha-openonu-go-test-bbsim.groovy
@@ -283,10 +283,7 @@
mkdir -p $ROBOT_LOGS_DIR
export ROBOT_MISC_ARGS="-d $ROBOT_LOGS_DIR -e PowerSwitch"
- export TARGET=reconcile-openonu-go-adapter-test-dt
-
-
- make -C $WORKSPACE/voltha-system-tests \$TARGET || true
+ make -C $WORKSPACE/voltha-system-tests ${makeReconcileDtTestTarget} || true
# stop logging
P_IDS="$(ps e -ww -A | grep "_TAG=kail-reconcile-dt" | grep -v grep | awk '{print $1}')"
@@ -337,10 +334,7 @@
mkdir -p $ROBOT_LOGS_DIR
export ROBOT_MISC_ARGS="-d $ROBOT_LOGS_DIR -e PowerSwitch"
- export TARGET=reconcile-openonu-go-adapter-test
-
-
- make -C $WORKSPACE/voltha-system-tests \$TARGET || true
+ make -C $WORKSPACE/voltha-system-tests ${makeReconcileTestTarget} || true
# stop logging
P_IDS="$(ps e -ww -A | grep "_TAG=kail-reconcile-att" | grep -v grep | awk '{print $1}')"
@@ -385,9 +379,7 @@
mkdir -p $ROBOT_LOGS_DIR
export ROBOT_MISC_ARGS="-d $ROBOT_LOGS_DIR -e PowerSwitch"
- export TARGET=reconcile-openonu-go-adapter-test-tt
-
- make -C $WORKSPACE/voltha-system-tests \$TARGET || true
+ make -C $WORKSPACE/voltha-system-tests ${makeReconcileTtTestTarget} || true
# stop logging
P_IDS="$(ps e -ww -A | grep "_TAG=kail-reconcile-tt" | grep -v grep | awk '{print $1}')"
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index f1cd8d2..1f6c68d 100755
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -16,6 +16,9 @@
make-target-multipleolt: bbsim-multiolt-kind
make-target-1t4gemtest: 1t4gem-openonu-go-adapter-test
make-target-1t8gemtest: 1t8gem-openonu-go-adapter-test
+ make-target-reconciletest: reconcile-openonu-go-adapter-test
+ make-target-reconciledttest: reconcile-openonu-go-adapter-test-dt
+ make-target-reconciletttest: reconcile-openonu-go-adapter-test-tt
jobs:
- 'voltha-periodic-test':
@@ -73,6 +76,9 @@
make-target: openonu-go-adapter-test
make-target-1t4gemtest: 1t4gem-openonu-go-adapter-test
make-target-1t8gemtest: 1t8gem-openonu-go-adapter-test
+ make-target-reconciletest: reconcile-openonu-go-adapter-test
+ make-target-reconciledttest: reconcile-openonu-go-adapter-test-dt
+ make-target-reconciletttest: reconcile-openonu-go-adapter-test-tt
withAlarms: false
code-branch: 'master'
time-trigger: "H H/12 * * *"
@@ -84,6 +90,9 @@
make-target: openonu-go-adapter-test
make-target-1t4gemtest: 1t4gem-openonu-go-adapter-test
make-target-1t8gemtest: 1t8gem-openonu-go-adapter-test
+ make-target-reconciletest: reconcile-openonu-go-adapter-test
+ make-target-reconciledttest: reconcile-openonu-go-adapter-test-dt
+ make-target-reconciletttest: reconcile-openonu-go-adapter-test-tt
withAlarms: false
code-branch: 'voltha-2.7'
time-trigger: "H H/23 * * *"
@@ -95,6 +104,9 @@
make-target: openonu-go-adapter-multi-olt-test
make-target-1t4gemtest: 1t4gem-openonu-go-adapter-multi-olt-test
make-target-1t8gemtest: 1t8gem-openonu-go-adapter-multi-olt-test
+ make-target-reconciletest: reconcile-openonu-go-adapter-multi-olt-test
+ make-target-reconciledttest: reconcile-openonu-go-adapter-multi-olt-test-dt
+ make-target-reconciletttest: reconcile-openonu-go-adapter-multi-olt-test-tt
withAlarms: false
code-branch: 'master'
olts: 2
@@ -109,6 +121,9 @@
make-target: openonu-go-adapter-multi-olt-test
make-target-1t4gemtest: 1t4gem-openonu-go-adapter-multi-olt-test
make-target-1t8gemtest: 1t8gem-openonu-go-adapter-multi-olt-test
+ make-target-reconciletest: reconcile-openonu-go-adapter-test
+ make-target-reconciledttest: reconcile-openonu-go-adapter-test-dt
+ make-target-reconciletttest: reconcile-openonu-go-adapter-test-tt
withAlarms: false
code-branch: 'voltha-2.7'
olts: 2
@@ -330,6 +345,21 @@
description: 'Makefile target to invoke during 1t8gem test'
- string:
+ name: makeReconcileTestTarget
+ default: '{make-target-reconciletest}'
+ description: 'Makefile target to invoke during reconcile test'
+
+ - string:
+ name: makeReconcileDtTestTarget
+ default: '{make-target-reconciledttest}'
+ description: 'Makefile target to invoke during reconcile dt test'
+
+ - string:
+ name: makeReconcileTtTestTarget
+ default: '{make-target-reconciletttest}'
+ description: 'Makefile target to invoke during reconcile tt test'
+
+ - string:
name: manifestUrl
default: '{gerrit-server-url}/{voltha-test-manifest-repo}'
description: 'Repo manifest URL for code checkout'