Skip to content
Snippets Groups Projects
Commit a6b76683 authored by Lars Beckers's avatar Lars Beckers
Browse files

bump configuration to buster

parent 6e78593b
No related branches found
No related tags found
No related merge requests found
Pipeline #1575 failed
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: stages:
- build - build
...@@ -12,17 +12,10 @@ variables: ...@@ -12,17 +12,10 @@ variables:
QUILT_PATCHES: "debian/patches" QUILT_PATCHES: "debian/patches"
before_script: 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 update
- apt-get install -y apt-utils - apt-get install -y apt-utils
sssd:
stage: build
script: scripts/sssd.sh
artifacts:
paths:
- packages/*
adcli: adcli:
stage: build stage: build
script: scripts/adcli.sh script: scripts/adcli.sh
...@@ -59,7 +52,6 @@ painintheapt: ...@@ -59,7 +52,6 @@ painintheapt:
- packages/* - packages/*
acmebot: acmebot:
image: registry.git.fsmpi.rwth-aachen.de/infra/ci-containers/fsmpi-packages:buster
stage: build stage: build
script: scripts/acmebot.sh script: scripts/acmebot.sh
artifacts: artifacts:
......
--- 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"
]
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
source "${BASH_SOURCE%/*}/common.sh" source "${BASH_SOURCE%/*}/common.sh"
get_sources adcli stretch get_sources adcli buster
import_patches adcli import_patches adcli
dch_custom "Apply the unreleased upstream-patches, fixing RT#100" dch_custom "Apply the unreleased upstream-patches, fixing RT#100"
dch --newversion "0.8.2-1.1~fsmpi" "Bump version" dch --newversion "0.8.2-1.1~fsmpi" "Bump version"
......
...@@ -2,10 +2,9 @@ ...@@ -2,10 +2,9 @@
source "${BASH_SOURCE%/*}/common.sh" source "${BASH_SOURCE%/*}/common.sh"
get_sources ganeti stretch get_sources ganeti buster
import_patches ganeti 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 "Remove blockdev storage from the movable and mirrored devices lists."
dch_custom "Increase maximum disk count per instance." dch_custom "Increase maximum disk count per instance."
dch_custom "Add support for disk cache usage with rbd devices." dch_custom "Add support for disk cache usage with rbd devices."
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
source "${BASH_SOURCE%/*}/common.sh" source "${BASH_SOURCE%/*}/common.sh"
get_sources nginx stretch get_sources nginx buster
cd debian cd debian
cp libnginx-mod.nginx.skeleton libnginx-mod-http-shibboleth.nginx cp libnginx-mod.nginx.skeleton libnginx-mod-http-shibboleth.nginx
cd modules cd modules
......
#!/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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment