Skip to content
Snippets Groups Projects
Commit 4b50e0aa authored by Philipp Spilger's avatar Philipp Spilger
Browse files

Make yashchiki folder location configurable and available via env

Change-Id: Ibee0500b2e1823724f664a1c06bc291012f0d8e6
parent 9bb05fc0
No related branches found
No related tags found
No related merge requests found
......@@ -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"
......
......@@ -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"
......
......@@ -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
......
......@@ -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 \
......
......@@ -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
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment