Skip to content
Snippets Groups Projects
Commit a7c83a40 authored by Jakob Kaiser's avatar Jakob Kaiser
Browse files

chore: env var DEPENDENCY_PYTHON no longer used

Change-Id: I4d19e6d54cda167a4fc40e585f72d6e7bd869c91
parent d40b5a00
No related branches found
No related tags found
No related merge requests found
...@@ -35,12 +35,6 @@ pipeline { ...@@ -35,12 +35,6 @@ pipeline {
stage('Container Build') { stage('Container Build') {
environment { environment {
DOCKER_BASE_IMAGE = "debian:bullseye" 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" DEPENDENCY_PYTHON3 = "python@3.8.2"
YASHCHIKI_IMAGE_NAME = "singularity_visionary_temp.img" YASHCHIKI_IMAGE_NAME = "singularity_visionary_temp.img"
YASHCHIKI_SANDBOXES = "sandboxes" YASHCHIKI_SANDBOXES = "sandboxes"
......
...@@ -37,7 +37,6 @@ pipeline { ...@@ -37,7 +37,6 @@ pipeline {
environment { environment {
DOCKER_BASE_IMAGE = "centos:7" DOCKER_BASE_IMAGE = "centos:7"
// versions from system packages // versions from system packages
DEPENDENCY_PYTHON = "python@2.7.5"
DEPENDENCY_PYTHON3 = "python@3.8.3" DEPENDENCY_PYTHON3 = "python@3.8.3"
YASHCHIKI_IMAGE_NAME = "singularity_asic_temp.img" YASHCHIKI_IMAGE_NAME = "singularity_asic_temp.img"
YASHCHIKI_SANDBOXES = "sandboxes" YASHCHIKI_SANDBOXES = "sandboxes"
......
...@@ -230,7 +230,6 @@ From: ${DOCKER_BASE_IMAGE} ...@@ -230,7 +230,6 @@ From: ${DOCKER_BASE_IMAGE}
## install locales ## install locales
#locale-gen #locale-gen
# propagate environment variables to container recipe # propagate environment variables to container recipe
export DEPENDENCY_PYTHON="${DEPENDENCY_PYTHON}"
export DEPENDENCY_PYTHON3="${DEPENDENCY_PYTHON3}" export DEPENDENCY_PYTHON3="${DEPENDENCY_PYTHON3}"
export YASHCHIKI_BUILD_SPACK_GCC="${YASHCHIKI_BUILD_SPACK_GCC}" export YASHCHIKI_BUILD_SPACK_GCC="${YASHCHIKI_BUILD_SPACK_GCC}"
export YASHCHIKI_SPACK_GCC="${YASHCHIKI_SPACK_GCC}" export YASHCHIKI_SPACK_GCC="${YASHCHIKI_SPACK_GCC}"
......
...@@ -4,6 +4,5 @@ echo "Setting undefined required environment variables to 'undefined'." >&2 ...@@ -4,6 +4,5 @@ echo "Setting undefined required environment variables to 'undefined'." >&2
export BUILD_CACHE_NAME="${BUILD_CACHE_NAME:-undefined}" export BUILD_CACHE_NAME="${BUILD_CACHE_NAME:-undefined}"
export DEPENDENCY_PYTHON3="${DEPENDENCY_PYTHON3:-undefined}" export DEPENDENCY_PYTHON3="${DEPENDENCY_PYTHON3:-undefined}"
export DEPENDENCY_PYTHON="${DEPENDENCY_PYTHON:-undefined}"
export YASHCHIKI_SPACK_GCC="${YASHCHIKI_SPACK_GCC:-undefined}" export YASHCHIKI_SPACK_GCC="${YASHCHIKI_SPACK_GCC:-undefined}"
export WORKSPACE="${WORKSPACE:-undefined}" export WORKSPACE="${WORKSPACE:-undefined}"
...@@ -71,7 +71,6 @@ From: ${DOCKER_BASE_IMAGE} ...@@ -71,7 +71,6 @@ From: ${DOCKER_BASE_IMAGE}
# install locales # install locales
locale-gen locale-gen
# propagate environment variables to container recipe # propagate environment variables to container recipe
export DEPENDENCY_PYTHON="${DEPENDENCY_PYTHON}"
export DEPENDENCY_PYTHON3="${DEPENDENCY_PYTHON3}" export DEPENDENCY_PYTHON3="${DEPENDENCY_PYTHON3}"
export YASHCHIKI_BUILD_SPACK_GCC=${YASHCHIKI_BUILD_SPACK_GCC} export YASHCHIKI_BUILD_SPACK_GCC=${YASHCHIKI_BUILD_SPACK_GCC}
export YASHCHIKI_SPACK_GCC="${YASHCHIKI_SPACK_GCC}" export YASHCHIKI_SPACK_GCC="${YASHCHIKI_SPACK_GCC}"
......
...@@ -7,7 +7,6 @@ set -Eeuo pipefail ...@@ -7,7 +7,6 @@ set -Eeuo pipefail
# Define everything that needs to be defined in a normal run. # Define everything that needs to be defined in a normal run.
export BUILD_CACHE_NAME=undefined export BUILD_CACHE_NAME=undefined
export DEPENDENCY_PYTHON3=undefined export DEPENDENCY_PYTHON3=undefined
export DEPENDENCY_PYTHON=undefined
export VISIONARY_GCC=undefined export VISIONARY_GCC=undefined
export BUILD_URL="https://obreitwi/testing/manual.html" export BUILD_URL="https://obreitwi/testing/manual.html"
......
...@@ -96,7 +96,6 @@ fi ...@@ -96,7 +96,6 @@ fi
# dumping (TODO: keep in sync with .ci/dummy_variables.sh!). # dumping (TODO: keep in sync with .ci/dummy_variables.sh!).
export BUILD_CACHE_NAME="${BUILD_CACHE_NAME:-undefined}" export BUILD_CACHE_NAME="${BUILD_CACHE_NAME:-undefined}"
export DEPENDENCY_PYTHON3="${DEPENDENCY_PYTHON3:-undefined}" export DEPENDENCY_PYTHON3="${DEPENDENCY_PYTHON3:-undefined}"
export DEPENDENCY_PYTHON="${DEPENDENCY_PYTHON:-undefined}"
export VISIONARY_GCC="${VISIONARY_GCC:-undefined}" export VISIONARY_GCC="${VISIONARY_GCC:-undefined}"
export WORKSPACE="${WORKSPACE:-undefined}" export WORKSPACE="${WORKSPACE:-undefined}"
......
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