From a7c83a4093e208ac9e1334ed398c39bda2bb0871 Mon Sep 17 00:00:00 2001
From: Jakob Kaiser <jakob.kaiser@kip.uni-heidelberg.de>
Date: Mon, 15 Jan 2024 11:35:22 +0000
Subject: [PATCH] chore: env var DEPENDENCY_PYTHON no longer used
Change-Id: I4d19e6d54cda167a4fc40e585f72d6e7bd869c91
---
.ci/Jenkinsfile | 6 ------
.ci/Jenkinsfile_asic | 1 -
.ci/asic_create_recipe.sh | 1 -
.ci/dummy_variables.sh | 1 -
.ci/visionary_create_recipe.sh | 1 -
tests/test-gerrit_notify_change.sh | 1 -
utils/dump_cache.sh | 1 -
7 files changed, 12 deletions(-)
diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile
index f1e4ebf8..82408014 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 0169ae8b..e0f5180a 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 730cf04a..57dda411 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 3c82b86d..99a3c95b 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 7f6422f6..8e00e0fe 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 1cb7641d..ffe35007 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 6c002276..23fbb396 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}"
--
GitLab