From 0e665d5b76c27042b87fd5c7cadd30e8b1fdb43d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20M=C3=BCller?= <mueller@kip.uni-heidelberg.de>
Date: Fri, 5 Mar 2021 15:04:16 +0100
Subject: [PATCH] Switch base OS to Debian bullseye amd64
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* Also drop python-yaml (and python)… package doesn't exist anymore and
we probably don't need system python2?
* gawk 5 warns when escaping `~`… and it wasn't needed on older gawk
versions
Depends-On: 15547
Change-Id: Ib8a25d112ba1bfd75b8a5d005f2cfd93323e9e9f
---
.ci/Jenkinsfile | 2 +-
.ci/commons.sh | 2 +-
.ci/install_prerequisites.sh | 2 --
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile
index 4891f2d0..20548768 100755
--- a/.ci/Jenkinsfile
+++ b/.ci/Jenkinsfile
@@ -35,7 +35,7 @@ pipeline {
stage('Container Build') {
agent { label 'conviz1||conviz2' }
environment {
- DOCKER_BASE_IMAGE = "debian:buster"
+ 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
diff --git a/.ci/commons.sh b/.ci/commons.sh
index 76d5869e..ef43c8c0 100755
--- a/.ci/commons.sh
+++ b/.ci/commons.sh
@@ -639,7 +639,7 @@ get_latest_hash() {
# insert compiler name into spec name at appropriate position (i.e., prior to
# specifying any variants)
# \$1 is the hash, \$2 is the spec
- idx = match(\$2, /(\\+|\\~|$)/);
+ idx = match(\$2, /(\\+|~|$)/);
printf("%s%%%s%s /%s\\n", substr(\$2, 0, idx-1), compiler, substr(\$2, idx), \$1)
}
EOF
diff --git a/.ci/install_prerequisites.sh b/.ci/install_prerequisites.sh
index b47c4327..07b1b276 100755
--- a/.ci/install_prerequisites.sh
+++ b/.ci/install_prerequisites.sh
@@ -25,8 +25,6 @@ prerequisites=(
"patch"
"patchelf"
"procps"
- "python"
- "python-yaml"
"python3"
"python3-yaml"
"rsync"
--
GitLab