Merge "clean up and rename openonu go targets (This is one part of a patch pair, the other one is https://gerrit.opencord.org/c/voltha-system-tests/+/24547)"
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index fb3242c..b211dd4 100755
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -16,7 +16,7 @@
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-reconciletest: reconcile-openonu-go-adapter-test-att
make-target-reconciledttest: reconcile-openonu-go-adapter-test-dt
make-target-reconciletttest: reconcile-openonu-go-adapter-test-tt
@@ -92,7 +92,7 @@
time-trigger: "H H/12 * * *"
logLevel: 'DEBUG'
testTargets: |
- - target: openonu-go-adapter-test
+ - target: 1t1gem-openonu-go-adapter-test
workflow: att
flags: ""
teardown: true
@@ -108,7 +108,7 @@
workflow: att
flags: "--set pon=2,onu=2,controlledActivation=only-onu"
teardown: true
- - target: reconcile-openonu-go-adapter-test
+ - target: reconcile-openonu-go-adapter-test-att
workflow: att
flags: ""
teardown: true
@@ -130,7 +130,7 @@
gerritRefspec: '$GERRIT_REFSPEC'
logLevel: 'DEBUG'
testTargets: |
- - target: openonu-go-adapter-test
+ - target: 1t1gem-openonu-go-adapter-test
workflow: att
flags: ""
teardown: true
@@ -146,7 +146,7 @@
workflow: att
flags: "--set pon=2,onu=2,controlledActivation=only-onu"
teardown: true
- - target: reconcile-openonu-go-adapter-test
+ - target: reconcile-openonu-go-adapter-test-att
workflow: att
flags: ""
teardown: true
@@ -180,7 +180,7 @@
olts: 2
logLevel: 'DEBUG'
testTargets: |
- - target: openonu-go-adapter-multi-olt-test
+ - target: 1t1gem-openonu-go-adapter-multi-olt-test
workflow: att
flags: ""
teardown: true
@@ -192,7 +192,7 @@
workflow: att
flags: ""
teardown: true
- - target: reconcile-openonu-go-adapter-multi-olt-test
+ - target: reconcile-openonu-go-adapter-multi-olt-test-att
workflow: att
flags: ""
teardown: true
@@ -215,7 +215,7 @@
gerritRefspec: '$GERRIT_REFSPEC'
logLevel: 'DEBUG'
testTargets: |
- - target: openonu-go-adapter-multi-olt-test
+ - target: 1t1gem-openonu-go-adapter-multi-olt-test
workflow: att
flags: ""
teardown: true
@@ -227,7 +227,7 @@
workflow: att
flags: ""
teardown: true
- - target: reconcile-openonu-go-adapter-multi-olt-test
+ - target: reconcile-openonu-go-adapter-multi-olt-test-att
workflow: att
flags: ""
teardown: true
@@ -248,9 +248,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
+ 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: 'voltha-2.7'
olts: 2
@@ -484,7 +484,7 @@
# the provided configuration and then the make target is invoked,
# example value (has to be valid YAML):
# testTargets: |
- # - target: openonu-go-adapter-test
+ # - target: 1t1gem-openonu-go-adapter-test
# workflow: att
# flags: ""
# teardown: true