diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile index f1e4ebf8828acc8e1cef1ee7f15b770f443bb2f5..824080144c7a9f2955f7b85b51e5151326e08b96 100755 --- a/.ci/Jenkinsfile +++ b/.ci/Jenkinsfile @@ -35,12 +35,6 @@ pipeline { stage('Container Build') { environment { DOCKER_BASE_IMAGE = "debian:bullseye" - // FIXME: ^${DEPENDENCY_PYTHON} is a workaround for an invalid spectrum-mpi concretization - DEPENDENCY_PYTHON = "python@2.7.18" - // This needs to be here because otherwise the default python - // (2.7.18) will pollute the spec and lead to a conflict - // can be removed as soon as the explicit preferred version - // is dropped DEPENDENCY_PYTHON3 = "python@3.8.2" YASHCHIKI_IMAGE_NAME = "singularity_visionary_temp.img" YASHCHIKI_SANDBOXES = "sandboxes" diff --git a/.ci/Jenkinsfile_asic b/.ci/Jenkinsfile_asic index 0169ae8bf77e166e7d07e912b1f3ab3838117dff..e0f5180a5aa5b13c19b540542deeae895e56dfd7 100755 --- a/.ci/Jenkinsfile_asic +++ b/.ci/Jenkinsfile_asic @@ -37,7 +37,6 @@ pipeline { environment { DOCKER_BASE_IMAGE = "centos:7" // versions from system packages - DEPENDENCY_PYTHON = "python@2.7.5" DEPENDENCY_PYTHON3 = "python@3.8.3" YASHCHIKI_IMAGE_NAME = "singularity_asic_temp.img" YASHCHIKI_SANDBOXES = "sandboxes" diff --git a/.ci/asic_create_recipe.sh b/.ci/asic_create_recipe.sh index 730cf04a90a1ffdd2c275fa4d72437ac84e67a68..57dda411ef25d0dd534543d3addeee354601206d 100755 --- a/.ci/asic_create_recipe.sh +++ b/.ci/asic_create_recipe.sh @@ -230,7 +230,6 @@ From: ${DOCKER_BASE_IMAGE} ## install locales #locale-gen # propagate environment variables to container recipe - export DEPENDENCY_PYTHON="${DEPENDENCY_PYTHON}" export DEPENDENCY_PYTHON3="${DEPENDENCY_PYTHON3}" export YASHCHIKI_BUILD_SPACK_GCC="${YASHCHIKI_BUILD_SPACK_GCC}" export YASHCHIKI_SPACK_GCC="${YASHCHIKI_SPACK_GCC}" diff --git a/.ci/dummy_variables.sh b/.ci/dummy_variables.sh index 3c82b86d126212650163779a4a70c14ec8edf96f..99a3c95b7eb5a42dd9b2f7a6ec9db4df013c174f 100755 --- a/.ci/dummy_variables.sh +++ b/.ci/dummy_variables.sh @@ -4,6 +4,5 @@ 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 7f6422f64dc1068e39171219b5bb147de50d13fd..8e00e0fe6249ce4fc3827e0bb968f6497422b9a6 100755 --- a/.ci/visionary_create_recipe.sh +++ b/.ci/visionary_create_recipe.sh @@ -71,7 +71,6 @@ From: ${DOCKER_BASE_IMAGE} # install locales locale-gen # propagate environment variables to container recipe - export DEPENDENCY_PYTHON="${DEPENDENCY_PYTHON}" export DEPENDENCY_PYTHON3="${DEPENDENCY_PYTHON3}" export YASHCHIKI_BUILD_SPACK_GCC=${YASHCHIKI_BUILD_SPACK_GCC} export YASHCHIKI_SPACK_GCC="${YASHCHIKI_SPACK_GCC}" diff --git a/tests/test-gerrit_notify_change.sh b/tests/test-gerrit_notify_change.sh index 1cb7641d15b69a3f667b67312a472e9984f76b71..ffe3500721d82a5de650bfcf413aea89f6eb76c2 100755 --- a/tests/test-gerrit_notify_change.sh +++ b/tests/test-gerrit_notify_change.sh @@ -7,7 +7,6 @@ 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 6c002276fac3250de99b9adc1b1fbc81c5511380..23fbb396da7de53afa4a05def2dcc7864b9ba70a 100755 --- a/utils/dump_cache.sh +++ b/utils/dump_cache.sh @@ -96,7 +96,6 @@ fi # 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}"