From 9af0ec6ec5e308e55bc0f3f15e0438849a989fa8 Mon Sep 17 00:00:00 2001 From: Dimitri Savineau Date: Tue, 23 Jun 2020 12:31:59 -0400 Subject: [PATCH] container: revert flavors/releases update We can do this kind of changes directly in ceph-container instead of doing some kind of hack. https://github.com/ceph/ceph-container/pull/1696 Signed-off-by: Dimitri Savineau --- ceph-container-build-push-imgs-devel-nightly/build/build | 1 - .../definitions/ceph-container-build-push-imgs-devel-nightly.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/ceph-container-build-push-imgs-devel-nightly/build/build b/ceph-container-build-push-imgs-devel-nightly/build/build index 6ce21b88..718ed42d 100644 --- a/ceph-container-build-push-imgs-devel-nightly/build/build +++ b/ceph-container-build-push-imgs-devel-nightly/build/build @@ -3,5 +3,4 @@ set -e cd "$WORKSPACE"/ceph-container/ || exit -sed -i -e 's/master luminous mimic nautilus octopus/master nautilus octopus/' contrib/build-push-ceph-container-imgs.sh bash -x contrib/build-push-ceph-container-imgs.sh diff --git a/ceph-container-build-push-imgs-devel-nightly/config/definitions/ceph-container-build-push-imgs-devel-nightly.yml b/ceph-container-build-push-imgs-devel-nightly/config/definitions/ceph-container-build-push-imgs-devel-nightly.yml index 96d030a2..24442a64 100644 --- a/ceph-container-build-push-imgs-devel-nightly/config/definitions/ceph-container-build-push-imgs-devel-nightly.yml +++ b/ceph-container-build-push-imgs-devel-nightly/config/definitions/ceph-container-build-push-imgs-devel-nightly.yml @@ -33,7 +33,6 @@ - inject: properties-content: | DEVEL=true - FLAVORS="nautilus,centos,7 octopus,centos,8 master,centos,8" - shell: !include-raw: - ../../../scripts/build_utils.sh -- 2.39.5