Merge "Removing log collection from voltha-dt-physical-functional-tests.groovy as they are already collected in the tests"
diff --git a/jjb/pipeline/voltha/master/voltha-dt-physical-functional-tests.groovy b/jjb/pipeline/voltha/master/voltha-dt-physical-functional-tests.groovy
index 12065b9..7b90b2a 100644
--- a/jjb/pipeline/voltha/master/voltha-dt-physical-functional-tests.groovy
+++ b/jjb/pipeline/voltha/master/voltha-dt-physical-functional-tests.groovy
@@ -142,7 +142,6 @@
ROBOT_LOGS_DIR="$WORKSPACE/RobotLogs/dt-workflow/FunctionalTests"
}
steps {
- startComponentsLogs([logsDir: "$WORKSPACE/logs/FunctionalTests"])
sh """
mkdir -p $ROBOT_LOGS_DIR
if ( ${powerSwitch} ); then
@@ -152,7 +151,6 @@
fi
make -C $WORKSPACE/voltha-system-tests voltha-dt-test || true
"""
- stopComponentsLogs([logsDir: "$WORKSPACE/logs/FunctionalTests", compress: true])
}
}
@@ -163,7 +161,6 @@
ROBOT_LOGS_DIR="$WORKSPACE/RobotLogs/dt-workflow/FailureScenarios"
}
steps {
- startComponentsLogs([logsDir: "$WORKSPACE/logs/FailureScenarios"])
sh """
mkdir -p $ROBOT_LOGS_DIR
if ( ${powerSwitch} ); then
@@ -173,7 +170,6 @@
fi
make -C $WORKSPACE/voltha-system-tests voltha-dt-test || true
"""
- stopComponentsLogs([logsDir: "$WORKSPACE/logs/FailureScenarios", compress: true])
}
}
@@ -184,13 +180,11 @@
ROBOT_LOGS_DIR="$WORKSPACE/RobotLogs/dt-workflow/DataplaneTests"
}
steps {
- startComponentsLogs([logsDir: "$WORKSPACE/logs/DataplaneTests"])
sh """
mkdir -p $ROBOT_LOGS_DIR
export ROBOT_MISC_ARGS="--removekeywords wuks -i dataplaneDt -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}"
make -C $WORKSPACE/voltha-system-tests voltha-dt-test || true
"""
- stopComponentsLogs([logsDir: "$WORKSPACE/logs/DataplaneTests", compress: true])
}
}
stage('HA Tests') {
@@ -200,13 +194,11 @@
ROBOT_LOGS_DIR="$WORKSPACE/RobotLogs/ONOSHAScenarios"
}
steps {
- startComponentsLogs([logsDir: "$WORKSPACE/logs/ONOSHAScenarios"])
sh """
mkdir -p $ROBOT_LOGS_DIR
export ROBOT_MISC_ARGS="--removekeywords wuks -L TRACE -e bbsim -e notready -d $ROBOT_LOGS_DIR -v POD_NAME:${configFileName} -v workflow:${params.workFlow} -v KUBERNETES_CONFIGS_DIR:$WORKSPACE/${configBaseDir}/${configKubernetesDir} -v container_log_dir:$WORKSPACE -v OLT_ADAPTER_APP_LABEL:${oltAdapterAppLabel}"
make -C $WORKSPACE/voltha-system-tests voltha-test || true
"""
- stopComponentsLogs([logsDir: "$WORKSPACE/logs/ONOSHAScenarios", compress: true])
}
}
@@ -217,7 +209,6 @@
ROBOT_LOGS_DIR="$WORKSPACE/RobotLogs/dt-workflow/MultipleOLTScenarios"
}
steps {
- startComponentsLogs([logsDir: "$WORKSPACE/logs/ONOSHAScenarios"])
sh """
mkdir -p $ROBOT_LOGS_DIR
if ( ${powerSwitch} ); then
@@ -227,7 +218,6 @@
fi
make -C $WORKSPACE/voltha-system-tests voltha-dt-test || true
"""
- stopComponentsLogs([logsDir: "$WORKSPACE/logs/ONOSHAScenarios", compress: true])
}
}
@@ -239,13 +229,11 @@
ROBOT_LOGS_DIR="$WORKSPACE/RobotLogs/dt-workflow/ErrorScenarios"
}
steps {
- startComponentsLogs([logsDir: "$WORKSPACE/logs/ErrorScenarios"])
sh """
mkdir -p $ROBOT_LOGS_DIR
export ROBOT_MISC_ARGS="--removekeywords wuks -L TRACE -i functional -e bbsim -e notready -d $ROBOT_LOGS_DIR -v POD_NAME:${configFileName} -v workflow:${params.workFlow} -v KUBERNETES_CONFIGS_DIR:$WORKSPACE/${configBaseDir}/${configKubernetesDir} -v container_log_dir:$WORKSPACE -v OLT_ADAPTER_APP_LABEL:${oltAdapterAppLabel}"
make -C $WORKSPACE/voltha-system-tests voltha-test || true
"""
- stopComponentsLogs([logsDir: "$WORKSPACE/logs/ErrorScenarios", compress: true])
}
}
}
diff --git a/jjb/pipeline/voltha/voltha-2.8/voltha-dt-physical-functional-tests.groovy b/jjb/pipeline/voltha/voltha-2.8/voltha-dt-physical-functional-tests.groovy
index 8ea336e..1e5263d 100644
--- a/jjb/pipeline/voltha/voltha-2.8/voltha-dt-physical-functional-tests.groovy
+++ b/jjb/pipeline/voltha/voltha-2.8/voltha-dt-physical-functional-tests.groovy
@@ -117,7 +117,6 @@
ROBOT_LOGS_DIR="$WORKSPACE/RobotLogs/dt-workflow/FunctionalTests"
}
steps {
- startComponentsLogs(logsDir: "$WORKSPACE/logs/FunctionalTests")
sh """
mkdir -p $ROBOT_LOGS_DIR
if ( ${powerSwitch} ); then
@@ -127,7 +126,6 @@
fi
make -C $WORKSPACE/voltha-system-tests voltha-dt-test || true
"""
- stopComponentsLogs(logsDir: "$WORKSPACE/logs/FunctionalTests", compress: true)
}
}
@@ -138,7 +136,6 @@
ROBOT_LOGS_DIR="$WORKSPACE/RobotLogs/dt-workflow/FailureScenarios"
}
steps {
- startComponentsLogs(logsDir: "$WORKSPACE/logs/FailureScenarios")
sh """
mkdir -p $ROBOT_LOGS_DIR
if ( ${powerSwitch} ); then
@@ -148,7 +145,6 @@
fi
make -C $WORKSPACE/voltha-system-tests voltha-dt-test || true
"""
- stopComponentsLogs(logsDir: "$WORKSPACE/logs/FailureScenarios", compress: true)
}
}
@@ -159,13 +155,11 @@
ROBOT_LOGS_DIR="$WORKSPACE/RobotLogs/dt-workflow/DataplaneTests"
}
steps {
- startComponentsLogs(logsDir: "$WORKSPACE/logs/DataplaneTests")
sh """
mkdir -p $ROBOT_LOGS_DIR
export ROBOT_MISC_ARGS="--removekeywords wuks -i dataplaneDt -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}"
make -C $WORKSPACE/voltha-system-tests voltha-dt-test || true
"""
- stopComponentsLogs(logsDir: "$WORKSPACE/logs/DataplaneTests", compress: true)
}
}
stage('HA Tests') {
@@ -175,13 +169,11 @@
ROBOT_LOGS_DIR="$WORKSPACE/RobotLogs/ONOSHAScenarios"
}
steps {
- startComponentsLogs(logsDir: "$WORKSPACE/logs/ONOSHAScenarios")
sh """
mkdir -p $ROBOT_LOGS_DIR
export ROBOT_MISC_ARGS="--removekeywords wuks -L TRACE -e bbsim -e notready -d $ROBOT_LOGS_DIR -v POD_NAME:${configFileName} -v workflow:${params.workFlow} -v KUBERNETES_CONFIGS_DIR:$WORKSPACE/${configBaseDir}/${configKubernetesDir} -v container_log_dir:$WORKSPACE -v OLT_ADAPTER_APP_LABEL:${oltAdapterAppLabel}"
make -C $WORKSPACE/voltha-system-tests voltha-test || true
"""
- stopComponentsLogs(logsDir: "$WORKSPACE/logs/ONOSHAScenarios", compress: true)
}
}
@@ -192,7 +184,6 @@
ROBOT_LOGS_DIR="$WORKSPACE/RobotLogs/dt-workflow/MultipleOLTScenarios"
}
steps {
- startComponentsLogs(logsDir: "$WORKSPACE/logs/ONOSHAScenarios")
sh """
mkdir -p $ROBOT_LOGS_DIR
if ( ${powerSwitch} ); then
@@ -202,7 +193,6 @@
fi
make -C $WORKSPACE/voltha-system-tests voltha-dt-test || true
"""
- stopComponentsLogs(logsDir: "$WORKSPACE/logs/ONOSHAScenarios", compress: true)
}
}
@@ -214,13 +204,11 @@
ROBOT_LOGS_DIR="$WORKSPACE/RobotLogs/dt-workflow/ErrorScenarios"
}
steps {
- startComponentsLogs(logsDir: "$WORKSPACE/logs/ErrorScenarios")
sh """
mkdir -p $ROBOT_LOGS_DIR
export ROBOT_MISC_ARGS="--removekeywords wuks -L TRACE -i functional -e bbsim -e notready -d $ROBOT_LOGS_DIR -v POD_NAME:${configFileName} -v workflow:${params.workFlow} -v KUBERNETES_CONFIGS_DIR:$WORKSPACE/${configBaseDir}/${configKubernetesDir} -v container_log_dir:$WORKSPACE -v OLT_ADAPTER_APP_LABEL:${oltAdapterAppLabel}"
make -C $WORKSPACE/voltha-system-tests voltha-test || true
"""
- stopComponentsLogs(logsDir: "$WORKSPACE/logs/ErrorScenarios", compress: true)
}
}
}
diff --git a/vars/startComponentsLogs.groovy b/vars/startComponentsLogs.groovy
index 4cea1d2..a485be4 100644
--- a/vars/startComponentsLogs.groovy
+++ b/vars/startComponentsLogs.groovy
@@ -47,7 +47,7 @@
def tag = "${tagPrefix}-kail-${logFile}"
println "Starting logging process for label: ${label}"
sh """
- _TAG=${tag} kail -l ${label} --since 1h > ${cfg.logsDir}/${logFile}.log&
+ _TAG=${tag} kail -l ${label} > ${cfg.logsDir}/${logFile}.log&
"""
}
}