diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile index 19641bfe4001bb3e6aade748bd8893d8d7b02af6..4fa1b5fec8aec45482ac05b0d9e54cae6dcddb66 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_INSTALL = "${WORKSPACE}/yashchiki" YASHCHIKI_HOST_ENV_PATH = "${WORKSPACE}/host.env" YASHCHIKI_META_DIR = "${WORKSPACE}/meta" YASHCHIKI_RECIPE_PATH = "${WORKSPACE}/visionary_recipe.def" diff --git a/.ci/Jenkinsfile_asic b/.ci/Jenkinsfile_asic index 6d770cffa2c582f909cd2b1f99ab7d27da1c342e..2380a0b53c5cb5910c0433d87f2f3633c211cb60 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_INSTALL = "${WORKSPACE}/yashchiki" YASHCHIKI_HOST_ENV_PATH = "${WORKSPACE}/host.env" YASHCHIKI_META_DIR = "${WORKSPACE}/meta" YASHCHIKI_RECIPE_PATH = "${WORKSPACE}/asic_recipe.def" diff --git a/.ci/asic_create_recipe.sh b/.ci/asic_create_recipe.sh index 67685df7bcbb9b8e305b419db406cf29cc5d7d8f..cdb7b992a2d6ce4e4080bbe6459f83368e4b97b5 100755 --- a/.ci/asic_create_recipe.sh +++ b/.ci/asic_create_recipe.sh @@ -38,7 +38,7 @@ From: ${DOCKER_BASE_IMAGE} rsync -av "${META_DIR_OUTSIDE}"/* "\${SINGULARITY_ROOTFS}/${META_DIR_INSIDE}" # init scripts for user convenience mkdir -p "\${SINGULARITY_ROOTFS}/opt/init" - rsync -av "${WORKSPACE}"/yashchiki/misc-files/init/*.sh "\${SINGULARITY_ROOTFS}/opt/init" + rsync -av "${YASHCHIKI_INSTALL}"/misc-files/init/*.sh "\${SINGULARITY_ROOTFS}/opt/init" %files # NOTE: Due to a bug in singularity 2.6 all paths in this section _cannot_ @@ -46,10 +46,10 @@ From: ${DOCKER_BASE_IMAGE} # there are, I pray for your poor soul that escaping them works.. # --obreitwi, 17-02-19 # 23:45:51 # provide spack command to login shells - ${WORKSPACE}/yashchiki/misc-files/setup-spack.sh /etc/profile.d/setup-spack.sh - ${WORKSPACE}/yashchiki/misc-files/locale.gen /etc/locale.gen - ${WORKSPACE}/yashchiki/misc-files/locale.alias /etc/locale.alias - ${WORKSPACE}/yashchiki/misc-files/sudoers /etc/sudoers + ${YASHCHIKI_INSTALL}/misc-files/setup-spack.sh /etc/profile.d/setup-spack.sh + ${YASHCHIKI_INSTALL}/misc-files/locale.gen /etc/locale.gen + ${YASHCHIKI_INSTALL}/misc-files/locale.alias /etc/locale.alias + ${YASHCHIKI_INSTALL}/misc-files/sudoers /etc/sudoers ${HOST_ENV_FILE} ${HOST_ENV_FILE_INSIDE} %post diff --git a/.ci/dump_meta_info.sh b/.ci/dump_meta_info.sh index 04ee6e91df8d34680f16fdc02153f448c153eda3..460de3df77534052d33fbd2e386f6a0b644ca118 100755 --- a/.ci/dump_meta_info.sh +++ b/.ci/dump_meta_info.sh @@ -12,7 +12,7 @@ source "${SOURCE_DIR}/commons.sh" mkdir -p "${META_DIR_OUTSIDE}" ( - cd "${WORKSPACE}/yashchiki" + cd "${YASHCHIKI_INSTALL}" git log > "${META_DIR_OUTSIDE}/yashchiki_git.log" if [ "${CONTAINER_BUILD_TYPE}" = "testing" ]; then gerrit_get_current_change_commits \ diff --git a/.ci/visionary_create_recipe.sh b/.ci/visionary_create_recipe.sh index 0d73c0b207b52f4d7f075c055bf91777d95482bf..48bc894ea45759215f7ac919b77f8f1ffe7fa9f6 100755 --- a/.ci/visionary_create_recipe.sh +++ b/.ci/visionary_create_recipe.sh @@ -43,7 +43,7 @@ From: ${DOCKER_BASE_IMAGE} rsync -av "${META_DIR_OUTSIDE}"/* "\${SINGULARITY_ROOTFS}/${META_DIR_INSIDE}" # init scripts for user convenience mkdir -p "\${SINGULARITY_ROOTFS}/opt/init" - rsync -av "${WORKSPACE}"/yashchiki/misc-files/init/*.sh "\${SINGULARITY_ROOTFS}/opt/init" + rsync -av "${YASHCHIKI_INSTALL}"/misc-files/init/*.sh "\${SINGULARITY_ROOTFS}/opt/init" %files # NOTE: Due to a bug in singularity 2.6 all paths in this section _cannot_ @@ -51,10 +51,10 @@ From: ${DOCKER_BASE_IMAGE} # there are, I pray for your poor soul that escaping them works.. # --obreitwi, 17-02-19 # 23:45:51 # provide spack command to login shells - ${WORKSPACE}/yashchiki/misc-files/setup-spack.sh /etc/profile.d/setup-spack.sh - ${WORKSPACE}/yashchiki/misc-files/locale.gen /etc/locale.gen - ${WORKSPACE}/yashchiki/misc-files/locale.alias /etc/locale.alias - ${WORKSPACE}/yashchiki/misc-files/sudoers /etc/sudoers + ${YASHCHIKI_INSTALL}/misc-files/setup-spack.sh /etc/profile.d/setup-spack.sh + ${YASHCHIKI_INSTALL}/misc-files/locale.gen /etc/locale.gen + ${YASHCHIKI_INSTALL}/misc-files/locale.alias /etc/locale.alias + ${YASHCHIKI_INSTALL}/misc-files/sudoers /etc/sudoers ${HOST_ENV_FILE} ${HOST_ENV_FILE_INSIDE} %post