From 390fd0b7694cfa36ed48331d76b5b5f2840d2998 Mon Sep 17 00:00:00 2001
From: Netrapalli-Madhusudhan Raghunandan
<netrapalli-madhusudhan.raghunandan@partner.bmwgroup.com>
Date: Thu, 17 Apr 2025 09:13:37 +0200
Subject: [PATCH] copy artifacts from downstream
---
utils/ci/Jenkinsfile | 29 +++++++++++++++++++++++------
utils/ci/scripts/prepare.sh | 31 +++++++++++++++++++++++++++++++
2 files changed, 54 insertions(+), 6 deletions(-)
create mode 100755 utils/ci/scripts/prepare.sh
diff --git a/utils/ci/Jenkinsfile b/utils/ci/Jenkinsfile
index 2e89a20df..ef03599df 100644
--- a/utils/ci/Jenkinsfile
+++ b/utils/ci/Jenkinsfile
@@ -98,20 +98,37 @@ spec:
PYTHON_EXECUTABLE = 'python3'
}
stages {
+ stage('Linux: Cleanup') {
+ steps {
+ container('openpass-build') {
+ sh 'bash repo/utils/ci/scripts/prepare.sh'
+ }
+ }
+ }
stage('Run E2E') {
steps {
- build job: 'opEnd2End_Test', parameters: [string(name: 'OPTESTRUNNER_URL', value: "${env.OPTESTRUNNER_URL}"),
- string(name: 'GECCO_URL', value:"${env.GECCO_URL}"),
- string(name: 'GTGEN_CLI_URL', value: "${env.GTGEN_CLI_URL}"),
- string(name: 'GTGEN_SIM_URL', value: "${env.GTGEN_SIM_URL}")],
- propagate: true
+ script {
+ def e2eDownStream = build(job: 'opEnd2End_Test',
+ parameters: [string(name: 'OPTESTRUNNER_URL', value: "${env.OPTESTRUNNER_URL}"),
+ string(name: 'GECCO_URL', value:"${env.GECCO_URL}"),
+ string(name: 'GTGEN_CLI_URL', value: "${env.GTGEN_CLI_URL}"),
+ string(name: 'GTGEN_SIM_URL', value: "${env.GTGEN_SIM_URL}")],
+ propagate: true,
+ wait: true)
+ copyArtifacts(
+ projectName: 'opEnd2End_Test',
+ selector: specific("${e2eDownStream.number}"),
+ filter: '**/*.tar.gz',
+ target: 'artifacts/'
+ )
+ }
}
}
}
post {
always {
script {
- sh 'bash repo/utils/ci/scripts/90_pack_artifacts.sh'
+ // sh 'bash repo/utils/ci/scripts/90_pack_artifacts.sh'
archiveArtifacts allowEmptyArchive: true, artifacts: 'artifacts/**', followSymlinks: false
junit allowEmptyResults: true, testResults: 'build/**/*Tests.xml,repo/sim/tests/endToEndTests/pyOpenPASS/result_*.xml'
}
diff --git a/utils/ci/scripts/prepare.sh b/utils/ci/scripts/prepare.sh
new file mode 100755
index 000000000..77d16812f
--- /dev/null
+++ b/utils/ci/scripts/prepare.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+################################################################################
+# Copyright (c) 2021 in-tech GmbH
+# 2022-2025 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+################################################################################
+
+################################################################################
+# This script prepares building
+################################################################################
+
+MYDIR="$(dirname "$(readlink -f $0)")"
+cd "$MYDIR/../../../.." || exit 1
+
+if [ ! -d repo ]; then
+ echo "repo folder doesn't exist as expected. exiting."
+ exit 1
+fi
+
+# wipe build directories and pyOpenPASS results
+rm -rf artifacts deps
+mkdir artifacts
+printenv
+
+exit 0
--
GitLab