From 1e51f4aa3f58f978d82bb40a536fa5ff36ae8090 Mon Sep 17 00:00:00 2001
From: Philipp Spilger <philipp.spilger@kip.uni-heidelberg.de>
Date: Fri, 10 Sep 2021 14:30:06 +0200
Subject: [PATCH] Make meta directory root available and configurable via env
var
Change-Id: I3c64dab14705d5e79012fbfede452df61c455d59
---
.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 5251eba8..fcf33a7f 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_META_DIR = "${WORKSPACE}/meta"
YASHCHIKI_RECIPE_PATH = "${WORKSPACE}/visionary_recipe.def"
YASHCHIKI_CACHES_ROOT = "${HOME}"
YASHCHIKI_SPACK_PATH = "${env.WORKSPACE}/spack"
diff --git a/.ci/Jenkinsfile_asic b/.ci/Jenkinsfile_asic
index a97e2005..ce7aaabc 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_META_DIR = "${WORKSPACE}/meta"
YASHCHIKI_RECIPE_PATH = "${WORKSPACE}/asic_recipe.def"
YASHCHIKI_CACHES_ROOT = "${HOME}"
YASHCHIKI_SPACK_PATH = "${env.WORKSPACE}/spack"
diff --git a/.ci/commons.sh b/.ci/commons.sh
index 03b52dda..faeb3480 100755
--- a/.ci/commons.sh
+++ b/.ci/commons.sh
@@ -121,7 +121,7 @@ export PRESERVED_PACKAGES_INSIDE
export PRESERVED_PACKAGES_OUTSIDE
META_DIR_INSIDE="/opt/meta"
-META_DIR_OUTSIDE="$(get_host_env WORKSPACE)${META_DIR_INSIDE}"
+META_DIR_OUTSIDE="$(get_host_env YASHCHIKI_META_DIR)${META_DIR_INSIDE}"
export META_DIR_INSIDE
export META_DIR_OUTSIDE
--
GitLab