From 0a1a47813641a6cdd27595b26c8b68e73922e6e0 Mon Sep 17 00:00:00 2001 From: Jakob Kaiser <jakob.kaiser@kip.uni-heidelberg.de> Date: Mon, 15 Jan 2024 11:37:40 +0000 Subject: [PATCH] chore: rename env var DEPENDENCY_PYTHON3 to DEPENDENCY_PYTHON Change-Id: If401498093c6b5115e837bcf6acb44b9d79ac7ce --- .ci/Jenkinsfile | 2 +- .ci/Jenkinsfile_asic | 2 +- .ci/asic_create_recipe.sh | 2 +- .ci/asic_spack_collection.sh | 2 +- .ci/commons.sh | 2 +- .ci/dummy_variables.sh | 2 +- .ci/visionary_create_recipe.sh | 2 +- .ci/visionary_spack_collection.sh | 16 ++++++++-------- .ci/visionary_spack_custom_view.sh | 6 +++--- tests/test-gerrit_notify_change.sh | 2 +- utils/dump_cache.sh | 2 +- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile index 82408014..49946ce4 100755 --- a/.ci/Jenkinsfile +++ b/.ci/Jenkinsfile @@ -35,7 +35,7 @@ pipeline { stage('Container Build') { environment { DOCKER_BASE_IMAGE = "debian:bullseye" - DEPENDENCY_PYTHON3 = "python@3.8.2" + DEPENDENCY_PYTHON = "python@3.8.2" YASHCHIKI_IMAGE_NAME = "singularity_visionary_temp.img" YASHCHIKI_SANDBOXES = "sandboxes" YASHCHIKI_PROXY_HTTP = "http://proxy.kip.uni-heidelberg.de:8080" diff --git a/.ci/Jenkinsfile_asic b/.ci/Jenkinsfile_asic index e0f5180a..8b75e143 100755 --- a/.ci/Jenkinsfile_asic +++ b/.ci/Jenkinsfile_asic @@ -37,7 +37,7 @@ pipeline { environment { DOCKER_BASE_IMAGE = "centos:7" // versions from system packages - DEPENDENCY_PYTHON3 = "python@3.8.3" + DEPENDENCY_PYTHON = "python@3.8.3" YASHCHIKI_IMAGE_NAME = "singularity_asic_temp.img" YASHCHIKI_SANDBOXES = "sandboxes" YASHCHIKI_PROXY_HTTP = "http://proxy.kip.uni-heidelberg.de:8080" diff --git a/.ci/asic_create_recipe.sh b/.ci/asic_create_recipe.sh index 57dda411..4b4428b3 100755 --- a/.ci/asic_create_recipe.sh +++ b/.ci/asic_create_recipe.sh @@ -230,7 +230,7 @@ From: ${DOCKER_BASE_IMAGE} ## install locales #locale-gen # propagate environment variables to container recipe - export DEPENDENCY_PYTHON3="${DEPENDENCY_PYTHON3}" + export DEPENDENCY_PYTHON="${DEPENDENCY_PYTHON}" export YASHCHIKI_BUILD_SPACK_GCC="${YASHCHIKI_BUILD_SPACK_GCC}" export YASHCHIKI_SPACK_GCC="${YASHCHIKI_SPACK_GCC}" export YASHCHIKI_SPACK_GCC_VERSION="${YASHCHIKI_SPACK_GCC_VERSION}" diff --git a/.ci/asic_spack_collection.sh b/.ci/asic_spack_collection.sh index 1d1219ef..be74a8e2 100644 --- a/.ci/asic_spack_collection.sh +++ b/.ci/asic_spack_collection.sh @@ -1,7 +1,7 @@ # All spack packages that should be fetched/installed in the container spack_packages=( # "${SPEC_VIEW_VISIONARY_DEV_TOOLS}" # FIXME - "visionary-asic ^${DEPENDENCY_PYTHON3} %${YASHCHIKI_SPACK_GCC}" + "visionary-asic ^${DEPENDENCY_PYTHON} %${YASHCHIKI_SPACK_GCC}" ) spack_views=(\ diff --git a/.ci/commons.sh b/.ci/commons.sh index d3b85c5a..49cd13c0 100755 --- a/.ci/commons.sh +++ b/.ci/commons.sh @@ -170,7 +170,7 @@ fi ############ # the version of dev tools we want in our view -SPEC_VIEW_VISIONARY_DEV_TOOLS="visionary-dev-tools ^${DEPENDENCY_PYTHON3} %${YASHCHIKI_SPACK_GCC}" +SPEC_VIEW_VISIONARY_DEV_TOOLS="visionary-dev-tools ^${DEPENDENCY_PYTHON} %${YASHCHIKI_SPACK_GCC}" # used in VIEWS section below but needs to be defined before sourcing # associative array: spec to add -> view names seperated by spaces diff --git a/.ci/dummy_variables.sh b/.ci/dummy_variables.sh index 99a3c95b..813247f0 100755 --- a/.ci/dummy_variables.sh +++ b/.ci/dummy_variables.sh @@ -3,6 +3,6 @@ echo "Setting undefined required environment variables to 'undefined'." >&2 export BUILD_CACHE_NAME="${BUILD_CACHE_NAME:-undefined}" -export DEPENDENCY_PYTHON3="${DEPENDENCY_PYTHON3:-undefined}" +export DEPENDENCY_PYTHON="${DEPENDENCY_PYTHON:-undefined}" export YASHCHIKI_SPACK_GCC="${YASHCHIKI_SPACK_GCC:-undefined}" export WORKSPACE="${WORKSPACE:-undefined}" diff --git a/.ci/visionary_create_recipe.sh b/.ci/visionary_create_recipe.sh index 8e00e0fe..f2f02936 100755 --- a/.ci/visionary_create_recipe.sh +++ b/.ci/visionary_create_recipe.sh @@ -71,7 +71,7 @@ From: ${DOCKER_BASE_IMAGE} # install locales locale-gen # propagate environment variables to container recipe - export DEPENDENCY_PYTHON3="${DEPENDENCY_PYTHON3}" + export DEPENDENCY_PYTHON="${DEPENDENCY_PYTHON}" export YASHCHIKI_BUILD_SPACK_GCC=${YASHCHIKI_BUILD_SPACK_GCC} export YASHCHIKI_SPACK_GCC="${YASHCHIKI_SPACK_GCC}" export YASHCHIKI_SPACK_GCC_VERSION="${YASHCHIKI_SPACK_GCC_VERSION}" diff --git a/.ci/visionary_spack_collection.sh b/.ci/visionary_spack_collection.sh index b341dbc1..462b9133 100644 --- a/.ci/visionary_spack_collection.sh +++ b/.ci/visionary_spack_collection.sh @@ -2,14 +2,14 @@ spack_packages=( "${SPEC_VIEW_VISIONARY_DEV_TOOLS}" # START python 3 packages - "visionary-wafer~dev ^${DEPENDENCY_PYTHON3} %${YASHCHIKI_SPACK_GCC}" - "visionary-wafer ^${DEPENDENCY_PYTHON3} %${YASHCHIKI_SPACK_GCC}" - "visionary-wafer~dev+gccxml ^${DEPENDENCY_PYTHON3} %${YASHCHIKI_SPACK_GCC}" - "visionary-wafer+gccxml ^${DEPENDENCY_PYTHON3} %${YASHCHIKI_SPACK_GCC}" - "visionary-wafer-visu ^${DEPENDENCY_PYTHON3} %${YASHCHIKI_SPACK_GCC}" - "visionary-clusterservices ^${DEPENDENCY_PYTHON3} %${YASHCHIKI_SPACK_GCC}" - "visionary-dls~dev ^${DEPENDENCY_PYTHON3} %${YASHCHIKI_SPACK_GCC}" - "visionary-dls ^${DEPENDENCY_PYTHON3} %${YASHCHIKI_SPACK_GCC}" + "visionary-wafer~dev ^${DEPENDENCY_PYTHON} %${YASHCHIKI_SPACK_GCC}" + "visionary-wafer ^${DEPENDENCY_PYTHON} %${YASHCHIKI_SPACK_GCC}" + "visionary-wafer~dev+gccxml ^${DEPENDENCY_PYTHON} %${YASHCHIKI_SPACK_GCC}" + "visionary-wafer+gccxml ^${DEPENDENCY_PYTHON} %${YASHCHIKI_SPACK_GCC}" + "visionary-wafer-visu ^${DEPENDENCY_PYTHON} %${YASHCHIKI_SPACK_GCC}" + "visionary-clusterservices ^${DEPENDENCY_PYTHON} %${YASHCHIKI_SPACK_GCC}" + "visionary-dls~dev ^${DEPENDENCY_PYTHON} %${YASHCHIKI_SPACK_GCC}" + "visionary-dls ^${DEPENDENCY_PYTHON} %${YASHCHIKI_SPACK_GCC}" # END python 3 packages ) diff --git a/.ci/visionary_spack_custom_view.sh b/.ci/visionary_spack_custom_view.sh index 947f8e07..82c70d15 100644 --- a/.ci/visionary_spack_custom_view.sh +++ b/.ci/visionary_spack_custom_view.sh @@ -10,10 +10,10 @@ ${MY_SPACK_BIN} ${SPACK_ARGS_VIEW[@]+"${SPACK_ARGS_VIEW[@]}"} view -d yes symlin # Strong independent packages who need no gccxml # ################################################## -${MY_SPACK_BIN} ${SPACK_ARGS_VIEW[@]+"${SPACK_ARGS_VIEW[@]}"} view -d yes symlink -i ${MY_SPACK_VIEW_PREFIX}/visionary-dls-core $(get_latest_hash visionary-dls-core "^${DEPENDENCY_PYTHON3}") +${MY_SPACK_BIN} ${SPACK_ARGS_VIEW[@]+"${SPACK_ARGS_VIEW[@]}"} view -d yes symlink -i ${MY_SPACK_VIEW_PREFIX}/visionary-dls-core $(get_latest_hash visionary-dls-core "^${DEPENDENCY_PYTHON}") -${MY_SPACK_BIN} ${SPACK_ARGS_VIEW[@]+"${SPACK_ARGS_VIEW[@]}"} view -d yes symlink -i ${MY_SPACK_VIEW_PREFIX}/visionary-dls $(get_latest_hash visionary-dls+dev "^${DEPENDENCY_PYTHON3}") -${MY_SPACK_BIN} ${SPACK_ARGS_VIEW[@]+"${SPACK_ARGS_VIEW[@]}"} view -d yes symlink -i ${MY_SPACK_VIEW_PREFIX}/visionary-dls-nodev $(get_latest_hash visionary-dls~dev "^${DEPENDENCY_PYTHON3}") +${MY_SPACK_BIN} ${SPACK_ARGS_VIEW[@]+"${SPACK_ARGS_VIEW[@]}"} view -d yes symlink -i ${MY_SPACK_VIEW_PREFIX}/visionary-dls $(get_latest_hash visionary-dls+dev "^${DEPENDENCY_PYTHON}") +${MY_SPACK_BIN} ${SPACK_ARGS_VIEW[@]+"${SPACK_ARGS_VIEW[@]}"} view -d yes symlink -i ${MY_SPACK_VIEW_PREFIX}/visionary-dls-nodev $(get_latest_hash visionary-dls~dev "^${DEPENDENCY_PYTHON}") # slurvmiz needs no dev-tools because it is not for end-users ${MY_SPACK_BIN} ${SPACK_ARGS_VIEW[@]+"${SPACK_ARGS_VIEW[@]}"} view -d yes symlink -i ${MY_SPACK_VIEW_PREFIX}/visionary-slurmviz $(get_latest_hash "visionary-slurmviz %${YASHCHIKI_SPACK_GCC}") diff --git a/tests/test-gerrit_notify_change.sh b/tests/test-gerrit_notify_change.sh index ffe35007..c6c03eb1 100755 --- a/tests/test-gerrit_notify_change.sh +++ b/tests/test-gerrit_notify_change.sh @@ -6,7 +6,7 @@ set -Eeuo pipefail # Define everything that needs to be defined in a normal run. export BUILD_CACHE_NAME=undefined -export DEPENDENCY_PYTHON3=undefined +export DEPENDENCY_PYTHON=undefined export VISIONARY_GCC=undefined export BUILD_URL="https://obreitwi/testing/manual.html" diff --git a/utils/dump_cache.sh b/utils/dump_cache.sh index 23fbb396..dc458305 100755 --- a/utils/dump_cache.sh +++ b/utils/dump_cache.sh @@ -95,7 +95,7 @@ fi # Set variables that need to be defined but are irrelevant to buildcache # dumping (TODO: keep in sync with .ci/dummy_variables.sh!). export BUILD_CACHE_NAME="${BUILD_CACHE_NAME:-undefined}" -export DEPENDENCY_PYTHON3="${DEPENDENCY_PYTHON3:-undefined}" +export DEPENDENCY_PYTHON="${DEPENDENCY_PYTHON:-undefined}" export VISIONARY_GCC="${VISIONARY_GCC:-undefined}" export WORKSPACE="${WORKSPACE:-undefined}" -- GitLab