From b0cbe29a2ccf4acf1a7310dcb17eb4a3da32db74 Mon Sep 17 00:00:00 2001
From: Andrew Leonard <31470007+andrew-m-leonard@users.noreply.github.com>
Date: Wed, 29 May 2024 09:03:30 +0100
Subject: [PATCH] Revert "Archive all taps after parallel run (#1033)"

This reverts commit c999e3116b039817ed6fd8c7c9e04e309401fd93.
---
 pipelines/build/common/build_base_file.groovy | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/pipelines/build/common/build_base_file.groovy b/pipelines/build/common/build_base_file.groovy
index 1475e8e28..4d335bf2c 100644
--- a/pipelines/build/common/build_base_file.groovy
+++ b/pipelines/build/common/build_base_file.groovy
@@ -968,6 +968,16 @@ class Builder implements Serializable {
                                             throw new Exception("[ERROR] Archive artifact timeout (${pipelineTimeouts.ARCHIVE_ARTIFACTS_TIMEOUT} HOURS) for ${downstreamJobName}has been reached. Exiting...")
                                         }
 
+                                        // Archive tap files as a single tar file
+                                        context.sh "find . -type f -name '*.tap' -exec tar -czf AQAvitTapFiles.tar.gz {} + "
+                                        try {
+                                            context.timeout(time: pipelineTimeouts.ARCHIVE_ARTIFACTS_TIMEOUT, unit: 'HOURS') {
+                                                context.archiveArtifacts artifacts: "AQAvitTapFiles.tar.gz"
+                                            }
+                                        } catch (FlowInterruptedException e) {
+                                            throw new Exception("[ERROR] Archive AQAvitTapFiles.tar.gz timeout Exiting...")
+                                        }
+
                                         copyArtifactSuccess = true
                                         if (release) {
                                             def (String releaseToolUrl, String releaseComment) = publishBinary(config)
@@ -996,17 +1006,6 @@ class Builder implements Serializable {
                 }
             }
             context.parallel jobs
-            context.node('worker') {
-                // Archive tap files as a single tar file
-                context.sh "find . -type f -name '*.tap' -exec tar -czf AQAvitTapFiles.tar.gz {} + "
-                try {
-                    context.timeout(time: pipelineTimeouts.ARCHIVE_ARTIFACTS_TIMEOUT, unit: 'HOURS') {
-                        context.archiveArtifacts artifacts: "AQAvitTapFiles.tar.gz"
-                    }
-                } catch (FlowInterruptedException e) {
-                    throw new Exception("[ERROR] Archive AQAvitTapFiles.tar.gz timeout Exiting...")
-                }
-            }
             // publish to github if needed
             // Don't publish release automatically
             if (publish || release) {