commit 721c647471538469ee04959f9fcb616f53f9bd77
author Amaia <amaia.depablo@bisdn.de> Tue Jan 21 12:03:36 2025 +0100
committer Amaia <amaia.depablo@bisdn.de> Tue Jan 21 12:51:03 2025 +0100
tree 5adb6d5815f6406d5017cffb85a5bf10d57cb579
parent e5a79d70e6bafa57f94a6894e33f3505eed8a627

CI: restore zyxel pipeline & enable multi olt job

Change-Id: I91590cfa9d528474ac7f2427d73a14f53c81be34
Signed-off-by: Amaia <amaia.depablo@bisdn.de>

jjb/pipeline/voltha/voltha-tt-physical-functional-tests.groovy

diff --git a/jjb/pipeline/voltha/voltha-tt-physical-functional-tests.groovy b/jjb/pipeline/voltha/voltha-tt-physical-functional-tests.groovy
index ffd34a2..4470390 100644
--- a/jjb/pipeline/voltha/voltha-tt-physical-functional-tests.groovy
+++ b/jjb/pipeline/voltha/voltha-tt-physical-functional-tests.groovy
@@ -156,11 +156,7 @@
              export ROBOT_MISC_ARGS="--removekeywords wuks -i functionalTT -e PowerSwitch -i sanityTT -i sanityTT-MCAST -e bbsim -e notready -d $ROBOT_LOGS_DIR -v POD_NAME:${configFileName} -v KUBERNETES_CONFIGS_DIR:$WORKSPACE/${configBaseDir}/${configKubernetesDir} -v container_log_dir:$WORKSPACE -v OLT_ADAPTER_APP_LABEL:${oltAdapterAppLabel}"
         fi
         ROBOT_MISC_ARGS+=" -v NAMESPACE:${volthaNamespace} -v INFRA_NAMESPACE:${infraNamespace}"
-        if [[ ${configFileName} == *"zyxel"* ]]; then          
-          make -C $WORKSPACE/voltha-system-tests voltha-tt-test
-        else
-          make -C $WORKSPACE/voltha-system-tests voltha-tt-test || true
-        fi
+        make -C $WORKSPACE/voltha-system-tests voltha-tt-test || true
         """
       }
     }
@@ -181,11 +177,7 @@
                export ROBOT_MISC_ARGS="--removekeywords wuks -L TRACE -i functionalTT -e PowerSwitch -e bbsim -e notready -d $ROBOT_LOGS_DIR -v POD_NAME:${configFileName} -v KUBERNETES_CONFIGS_DIR:$WORKSPACE/${configBaseDir}/${configKubernetesDir} -v container_log_dir:$WORKSPACE -v OLT_ADAPTER_APP_LABEL:${oltAdapterAppLabel}"
           fi
           ROBOT_MISC_ARGS+=" -v NAMESPACE:${volthaNamespace} -v INFRA_NAMESPACE:${infraNamespace}"
-          if [[ ${configFileName} == *"zyxel"* ]]; then          
-            make -C $WORKSPACE/voltha-system-tests voltha-tt-test
-          else
-            make -C $WORKSPACE/voltha-system-tests voltha-tt-test || true
-          fi
+          make -C $WORKSPACE/voltha-system-tests voltha-tt-test || true
         fi
         """
       }
@@ -213,11 +205,7 @@
             export ROBOT_MISC_ARGS="--removekeywords wuks -L TRACE -i functionalTT -e PowerSwitch -e bbsim -e notready -d $ROBOT_LOGS_DIR -v teardown_device:False -v POD_NAME:${configFileName} -v KUBERNETES_CONFIGS_DIR:$WORKSPACE/${configBaseDir}/${configKubernetesDir} -v container_log_dir:$WORKSPACE -v OLT_ADAPTER_APP_LABEL:${oltAdapterAppLabel} -V $ROBOT_TEST_INPUT_FILE"
           fi
           ROBOT_MISC_ARGS+=" -v NAMESPACE:${volthaNamespace} -v INFRA_NAMESPACE:${infraNamespace}"
-          if [[ ${configFileName} == *"zyxel"* ]]; then          
-            make -C $WORKSPACE/voltha-system-tests voltha-tt-test
-          else
-            make -C $WORKSPACE/voltha-system-tests voltha-tt-test || true
-          fi
+          make -C $WORKSPACE/voltha-system-tests voltha-tt-test || true
         fi
         """
       }
@@ -240,11 +228,7 @@
              export ROBOT_MISC_ARGS="--removekeywords wuks -i multicastTT -e PowerSwitch -e bbsim -e notready -d $ROBOT_LOGS_DIR -v teardown_device:False -v POD_NAME:${configFileName} -v KUBERNETES_CONFIGS_DIR:$WORKSPACE/${configBaseDir}/${configKubernetesDir} -v container_log_dir:$WORKSPACE -v OLT_ADAPTER_APP_LABEL:${oltAdapterAppLabel} -V $ROBOT_TEST_INPUT_FILE"
           fi
           ROBOT_MISC_ARGS+=" -v NAMESPACE:${volthaNamespace} -v INFRA_NAMESPACE:${infraNamespace}"
-          if [[ ${configFileName} == *"zyxel"* ]]; then          
-            make -C $WORKSPACE/voltha-system-tests voltha-tt-test
-          else
-            make -C $WORKSPACE/voltha-system-tests voltha-tt-test || true
-          fi
+          make -C $WORKSPACE/voltha-system-tests voltha-tt-test || true
         fi
         """
       }