diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile index 5251eba821ad936b1b25fe5e9af7318986a9125a..fcf33a7f07032f7ee43e905a9bfcb0d72720e716 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 a97e2005dc55cf4b53acc38a48f048e0387f6428..ce7aaabc6eadd6fb35c48857974c61305f2ace11 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 03b52dda711a4f405de7aa23c97840d0b984dd4a..faeb3480563a1958e7635d6bc029ce540f331ed3 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