From b7da4738f211cfca701f247fb9e91e531eab34ad Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Thu, 21 Jul 2022 12:50:21 +0200 Subject: [PATCH] stable-7.0: initial commit let's branch stable-7.0 that will be the corresponding branch for Ceph Quincy / RHCS 6.0 Signed-off-by: Guillaume Abrioux --- .github/workflows/container.yml | 6 +++--- Makefile | 9 +-------- contrib/commit-rhcs.sh | 4 ++-- contrib/compose-rhcs.sh | 4 ++-- tox.ini | 2 +- 5 files changed, 9 insertions(+), 16 deletions(-) diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml index c34aef988..d5994edae 100644 --- a/.github/workflows/container.yml +++ b/.github/workflows/container.yml @@ -8,10 +8,10 @@ jobs: uses: actions/checkout@v2 - name: build the ceph container image - run: make BASEOS_REGISTRY=quay.io/centos BASEOS_TAG=stream8 RELEASE="demo" FLAVORS="main,centos,8" build + run: make BASEOS_REGISTRY=quay.io/centos BASEOS_TAG=stream8 RELEASE="demo" FLAVORS="quincy,centos,8" build - name: run the ceph demo container - run: docker run -d --privileged --name ceph-demo -v /mnt/ceph:/var/lib/ceph -e RGW_FRONTEND_TYPE=beast -e DEBUG=verbose -e RGW_FRONTEND_PORT=8000 -e MON_IP=127.0.0.1 -e CEPH_PUBLIC_NETWORK=0.0.0.0/0 -e CLUSTER=ceph -e CEPH_DEMO_UID=demo -e CEPH_DEMO_ACCESS_KEY=G1EZ5R4K6IJ7XUQKMAED -e CEPH_DEMO_SECRET_KEY=cNmUrqpBKjCMzcfqG8fg4Qk07Xkoyau52OmvnSsz -e CEPH_DEMO_BUCKET=foobar -e SREE_PORT=5001 -e DATA_TO_SYNC=/etc/modprobe.d -e DATA_TO_SYNC_BUCKET=github -e OSD_COUNT=2 ceph/daemon:demo-main-centos-stream8-x86_64 demo + run: docker run -d --privileged --name ceph-demo -v /mnt/ceph:/var/lib/ceph -e RGW_FRONTEND_TYPE=beast -e DEBUG=verbose -e RGW_FRONTEND_PORT=8000 -e MON_IP=127.0.0.1 -e CEPH_PUBLIC_NETWORK=0.0.0.0/0 -e CLUSTER=ceph -e CEPH_DEMO_UID=demo -e CEPH_DEMO_ACCESS_KEY=G1EZ5R4K6IJ7XUQKMAED -e CEPH_DEMO_SECRET_KEY=cNmUrqpBKjCMzcfqG8fg4Qk07Xkoyau52OmvnSsz -e CEPH_DEMO_BUCKET=foobar -e SREE_PORT=5001 -e DATA_TO_SYNC=/etc/modprobe.d -e DATA_TO_SYNC_BUCKET=github -e OSD_COUNT=2 ceph/daemon:demo-quincy-centos-stream8-x86_64 demo - name: run the demo validation run: | @@ -39,4 +39,4 @@ jobs: run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes - name: build the ceph container arm64 image - run: make BASEOS_REGISTRY=quay.io BASEOS_TAG=stream8 RELEASE="demo" BASEOS_REPO=centos/arm64v8 DAEMON_BASE_TAG="daemon-base:demo-centos-8-aarch64" DAEMON_TAG="daemon:demo-centos-stream8-aarch64" FLAVORS="main,centos-arm64,8" build + run: make BASEOS_REGISTRY=quay.io BASEOS_TAG=stream8 RELEASE="demo" BASEOS_REPO=centos/arm64v8 DAEMON_BASE_TAG="daemon-base:demo-centos-8-aarch64" DAEMON_TAG="daemon:demo-centos-stream8-aarch64" FLAVORS="quincy,centos-arm64,8" build diff --git a/Makefile b/Makefile index 0b6807176..33da9b84d 100644 --- a/Makefile +++ b/Makefile @@ -18,10 +18,7 @@ # When updating these defaults, be sure to check that ALL_BUILDABLE_FLAVORS is updated FLAVORS ?= \ - octopus,centos,8 \ - pacific,centos,8 \ quincy,centos,8 \ - main,centos,8 TAG_REGISTRY ?= ceph @@ -48,11 +45,7 @@ include maint-lib/makelib.mk # All flavor options that can be passed to FLAVORS ALL_BUILDABLE_FLAVORS := \ - octopus,centos,7 \ - octopus,centos,8 \ - pacific,centos,8 \ - quincy,centos,8 \ - main,centos,8 + quincy,centos,8 # ============================================================================== # Build targets diff --git a/contrib/commit-rhcs.sh b/contrib/commit-rhcs.sh index f0d8ba049..695897789 100755 --- a/contrib/commit-rhcs.sh +++ b/contrib/commit-rhcs.sh @@ -39,7 +39,7 @@ trap cleanup EXIT QUIT INT TERM step "Updating local repository" git fetch || fatal 'Cannot fetch the remote repository' git reset --hard "origin/$CURRENT_GIT_BRANCH" || fatal "Cannot reset the local directory !" -UPSTREAM_BRANCH_VERSION="main" +UPSTREAM_BRANCH_VERSION="stable-7.0" step "Cloning ceph-container ${UPSTREAM_BRANCH_VERSION}" git clone https://github.com/ceph/ceph-container.git -b "${UPSTREAM_BRANCH_VERSION}" "$CEPH_CONTAINER_DIR" @@ -49,7 +49,7 @@ pushd "$CEPH_CONTAINER_DIR" contrib/compose-rhcs.sh popd > /dev/null -COMPOSED_DIR=$CEPH_CONTAINER_DIR/staging/main-ubi8-latest-x86_64/composed +COMPOSED_DIR=$CEPH_CONTAINER_DIR/staging/quincy-ubi8-latest-x86_64/composed if [ ! -d "$COMPOSED_DIR" ]; then fatal "There is no composed directory. Looks like the build failed !" diff --git a/contrib/compose-rhcs.sh b/contrib/compose-rhcs.sh index c3b363af3..d68245545 100755 --- a/contrib/compose-rhcs.sh +++ b/contrib/compose-rhcs.sh @@ -6,7 +6,7 @@ set -e # VARIABLES # ############# -STAGING_DIR=staging/main-ubi9-latest-x86_64/ +STAGING_DIR=staging/quincy-ubi9-latest-x86_64/ DAEMON_BASE_DIR=$STAGING_DIR/daemon-base/ DOCKERFILE_DAEMON_BASE=$DAEMON_BASE_DIR/Dockerfile COMPOSED_DIR="${STAGING_DIR}"composed @@ -48,7 +48,7 @@ clean_staging() { } make_staging() { - make BASEOS_REGISTRY=registry.redhat.io BASEOS_REPO=ubi9/ubi-minimal FLAVORS=main,ubi9,latest IMAGES_TO_BUILD=daemon-base || fatal "Cannot build rhel9" + make BASEOS_REGISTRY=registry.redhat.io BASEOS_REPO=ubi9/ubi-minimal FLAVORS=quincy,ubi9,latest IMAGES_TO_BUILD=daemon-base || fatal "Cannot build rhel9" } success() { diff --git a/tox.ini b/tox.ini index e6f3694cb..26c09e614 100644 --- a/tox.ini +++ b/tox.ini @@ -22,7 +22,7 @@ setenv= collocation: CEPH_ANSIBLE_SCENARIO_PATH = {toxinidir}/ceph-ansible/tests/functional/collocation/container lvm_osds: CEPH_ANSIBLE_SCENARIO_PATH = {toxinidir}/ceph-ansible/tests/functional/lvm-osds/container REGISTRY_ADDRESS = 192.168.121.1:5000 - CEPH_ANSIBLE_BRANCH = main + CEPH_ANSIBLE_BRANCH = stable-7.0 VAGRANT_PROVIDER = {env:VAGRANT_PROVIDER:libvirt} CEPH_ANSIBLE_VAGRANT_BOX = centos/stream8 REGISTRY = quay.io