From a6b76683d87aa0a856d8f6ef7b5425595a21e6d7 Mon Sep 17 00:00:00 2001
From: Lars Beckers <lars.beckers@rwth-aachen.de>
Date: Sat, 16 Nov 2019 11:08:15 +0100
Subject: [PATCH] bump configuration to buster
---
.gitlab-ci.yml | 12 ++----------
patches/ganeti/fix_ceph_showmap.patch | 11 -----------
scripts/adcli.sh | 2 +-
scripts/ganeti.sh | 3 +--
scripts/nginx-shib.sh | 2 +-
scripts/sssd.sh | 14 --------------
6 files changed, 5 insertions(+), 39 deletions(-)
delete mode 100644 patches/ganeti/fix_ceph_showmap.patch
delete mode 100755 scripts/sssd.sh
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8f02aa6..fa1e63d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: registry.git.fsmpi.rwth-aachen.de/infra/ci-containers/fsmpi-packages:stretch
+image: registry.git.fsmpi.rwth-aachen.de/infra/ci-containers/fsmpi-packages:buster
stages:
- build
@@ -12,17 +12,10 @@ variables:
QUILT_PATCHES: "debian/patches"
before_script:
- - echo "deb-src http://ftp.halifax.rwth-aachen.de/debian/ stretch main" > /etc/apt/sources.list.d/stretch_src.list
+ - echo "deb-src http://ftp.halifax.rwth-aachen.de/debian/ buster main" > /etc/apt/sources.list.d/buster_src.list
- apt-get update
- apt-get install -y apt-utils
-sssd:
- stage: build
- script: scripts/sssd.sh
- artifacts:
- paths:
- - packages/*
-
adcli:
stage: build
script: scripts/adcli.sh
@@ -59,7 +52,6 @@ painintheapt:
- packages/*
acmebot:
- image: registry.git.fsmpi.rwth-aachen.de/infra/ci-containers/fsmpi-packages:buster
stage: build
script: scripts/acmebot.sh
artifacts:
diff --git a/patches/ganeti/fix_ceph_showmap.patch b/patches/ganeti/fix_ceph_showmap.patch
deleted file mode 100644
index ab1c59e..0000000
--- a/patches/ganeti/fix_ceph_showmap.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/lib/storage/bdev.py
-+++ b/lib/storage/bdev.py
-@@ -1020,8 +1020,6 @@ class RADOSBlockDevice(base.BlockDev):
- showmap_cmd = [
- constants.RBD_CMD,
- "showmapped",
-- "-p",
-- pool,
- "--format",
- "json"
- ]
diff --git a/scripts/adcli.sh b/scripts/adcli.sh
index e583391..ffeab70 100755
--- a/scripts/adcli.sh
+++ b/scripts/adcli.sh
@@ -2,7 +2,7 @@
source "${BASH_SOURCE%/*}/common.sh"
-get_sources adcli stretch
+get_sources adcli buster
import_patches adcli
dch_custom "Apply the unreleased upstream-patches, fixing RT#100"
dch --newversion "0.8.2-1.1~fsmpi" "Bump version"
diff --git a/scripts/ganeti.sh b/scripts/ganeti.sh
index a1684b3..8c8f5c1 100755
--- a/scripts/ganeti.sh
+++ b/scripts/ganeti.sh
@@ -2,10 +2,9 @@
source "${BASH_SOURCE%/*}/common.sh"
-get_sources ganeti stretch
+get_sources ganeti buster
import_patches ganeti
-dch_custom "Fix broken ceph support in bdev.py, see GitHub #1233."
dch_custom "Remove blockdev storage from the movable and mirrored devices lists."
dch_custom "Increase maximum disk count per instance."
dch_custom "Add support for disk cache usage with rbd devices."
diff --git a/scripts/nginx-shib.sh b/scripts/nginx-shib.sh
index f97572d..8028986 100755
--- a/scripts/nginx-shib.sh
+++ b/scripts/nginx-shib.sh
@@ -2,7 +2,7 @@
source "${BASH_SOURCE%/*}/common.sh"
-get_sources nginx stretch
+get_sources nginx buster
cd debian
cp libnginx-mod.nginx.skeleton libnginx-mod-http-shibboleth.nginx
cd modules
diff --git a/scripts/sssd.sh b/scripts/sssd.sh
deleted file mode 100755
index ad9824b..0000000
--- a/scripts/sssd.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-source "${BASH_SOURCE%/*}/common.sh"
-export DEB_BUILD_OPTIONS=nocheck
-
-echo "deb-src http://ftp.halifax.rwth-aachen.de/debian/ buster main" > /etc/apt/sources.list.d/buster_src.list
-apt-get update
-
-get_sources sssd buster
-dch_backport
-install_build_deps
-build
-test_install
-prepare_artifacts
--
GitLab