From 9bb05fc0740efce4812d8976a1b07cd8a32ece15 Mon Sep 17 00:00:00 2001
From: Philipp Spilger <philipp.spilger@kip.uni-heidelberg.de>
Date: Fri, 10 Sep 2021 14:33:07 +0200
Subject: [PATCH] Make host.env location configurable and available via env
Change-Id: I3065bed6bbb8c36a299ce975b9ca8c8500030d40
---
.ci/Jenkinsfile | 1 +
.ci/Jenkinsfile_asic | 1 +
.ci/commons.sh | 2 +-
3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile
index fcf33a7f..19641bfe 100755
--- a/.ci/Jenkinsfile
+++ b/.ci/Jenkinsfile
@@ -36,6 +36,7 @@ pipeline {
environment {
DOCKER_BASE_IMAGE = "debian:bullseye"
DEPENDENCY_PYTHON = "python@3.8.2"
+ YASHCHIKI_HOST_ENV_PATH = "${WORKSPACE}/host.env"
YASHCHIKI_META_DIR = "${WORKSPACE}/meta"
YASHCHIKI_RECIPE_PATH = "${WORKSPACE}/visionary_recipe.def"
YASHCHIKI_CACHES_ROOT = "${HOME}"
diff --git a/.ci/Jenkinsfile_asic b/.ci/Jenkinsfile_asic
index ce7aaabc..6d770cff 100755
--- a/.ci/Jenkinsfile_asic
+++ b/.ci/Jenkinsfile_asic
@@ -38,6 +38,7 @@ pipeline {
DOCKER_BASE_IMAGE = "centos:7"
// versions from system packages
DEPENDENCY_PYTHON = "python@3.8.3"
+ YASHCHIKI_HOST_ENV_PATH = "${WORKSPACE}/host.env"
YASHCHIKI_META_DIR = "${WORKSPACE}/meta"
YASHCHIKI_RECIPE_PATH = "${WORKSPACE}/asic_recipe.def"
YASHCHIKI_CACHES_ROOT = "${HOME}"
diff --git a/.ci/commons.sh b/.ci/commons.sh
index faeb3480..24ed0dc4 100755
--- a/.ci/commons.sh
+++ b/.ci/commons.sh
@@ -8,7 +8,7 @@ SOURCE_DIR="$(dirname "$(readlink -m "${BASH_SOURCE[0]}")")"
HOST_ENV_FILE_INSIDE="/tmp/spack/host.env"
if [ -n "${WORKSPACE:-}" ]; then
# we are not in container
- HOST_ENV_FILE="${WORKSPACE}/host.env"
+ HOST_ENV_FILE="${YASHCHIKI_HOST_ENV_PATH}"
else
HOST_ENV_FILE="${HOST_ENV_FILE_INSIDE}"
fi
--
GitLab