From 058bfbbc401f54bbf27f6cdf0b86ea1ca9fa4402 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 8 Nov 2021 14:49:06 +0000 Subject: [PATCH] Seperate history processing from results --- test/testethernetproduct.groovy | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/test/testethernetproduct.groovy b/test/testethernetproduct.groovy index 4cbde8e..7314343 100644 --- a/test/testethernetproduct.groovy +++ b/test/testethernetproduct.groovy @@ -90,6 +90,13 @@ pipeline { ftdiimportoptions.toolRepo(FTDI_SOURCE_URL, FTDI_SOURCE_REVISION) toolsimporter.getTool(meta, ftdiimportoptions, FTDI_SOURCE_DIR) + def HISTORY_PROCESSING_REPO = 'git@hydra:python_scripts/hmb_results_history_processing.git' + HISTORY_PROCESSING_DIR = "${WORKSPACE}/HistoryProcessing" + + def resultprocessingoptions = toolsimporter.getNewToolOptions() + resultprocessingoptions.toolName('History processing') + resultprocessingoptions.toolRepo(HISTORY_PROCESSING_REPO, HISTORY_PROCESSING_REVISION) + toolsimporter.getTool(meta, resultprocessingoptions, HISTORY_PROCESSING_DIR) } } } @@ -165,19 +172,19 @@ pipeline { } } } - } - } - stage("Archive Test History") { - steps{ - script { - dir(HISTORY_FOLDER) { - rc = bat (script:""" - "${PYTHON}" "GitCyclicPush.py" - """, - returnStatus: true - ) - if (rc == 1) { - unstable('FAILED to process history') + stage("Archive Test History") { + steps{ + script { + dir(HISTORY_FOLDER) { + rc = bat (script:""" + "${PYTHON}" "${HISTORY_PROCESSING_DIR}/GitCyclicPush.py" + """, + returnStatus: true + ) + if (rc == 1) { + unstable('FAILED to process history') + } + } } } }