From: Josh Durgin Date: Thu, 2 Mar 2023 18:14:16 +0000 (-0500) Subject: Update releases - add reef, remove octopus and older X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=a194803491630897432534b1a1ad8c0c13860441;p=ceph-build.git Update releases - add reef, remove octopus and older Signed-off-by: Josh Durgin --- diff --git a/ceph-api-nightly/config/definitions/ceph-api-nightly.yml b/ceph-api-nightly/config/definitions/ceph-api-nightly.yml index 3d62f752..a2bf0f57 100644 --- a/ceph-api-nightly/config/definitions/ceph-api-nightly.yml +++ b/ceph-api-nightly/config/definitions/ceph-api-nightly.yml @@ -2,10 +2,9 @@ name: ceph-api-nightly ceph_branch: - main + - reef - quincy - pacific - - octopus - - nautilus test_suite: - backend: test_suite_script: run-backend-api-tests.sh diff --git a/ceph-build/config/definitions/ceph-build.yml b/ceph-build/config/definitions/ceph-build.yml index b26aa46b..cdb05cc8 100644 --- a/ceph-build/config/definitions/ceph-build.yml +++ b/ceph-build/config/definitions/ceph-build.yml @@ -64,7 +64,7 @@ - condition-kind: and condition-operands: - condition-kind: regex-match - regex: (mimic|nautilus|octopus|pacific|quincy) + regex: (mimic|nautilus|octopus|pacific|quincy|reef) label: '${BRANCH}' - condition-kind: regex-match regex: (xenial|bionic|focal|jammy|centos7|centos8|centos9|buster|bullseye) diff --git a/ceph-dashboard-cephadm-e2e-nightly/config/definitions/ceph-dashboard-cephadm-e2e-nightly.yml b/ceph-dashboard-cephadm-e2e-nightly/config/definitions/ceph-dashboard-cephadm-e2e-nightly.yml index 1ee266f5..43d66b1b 100644 --- a/ceph-dashboard-cephadm-e2e-nightly/config/definitions/ceph-dashboard-cephadm-e2e-nightly.yml +++ b/ceph-dashboard-cephadm-e2e-nightly/config/definitions/ceph-dashboard-cephadm-e2e-nightly.yml @@ -2,9 +2,9 @@ name: ceph-dashboard-cephadm-e2e-nightly ceph_branch: - main + - reef - quincy - pacific - - octopus jobs: - '{name}-{ceph_branch}' diff --git a/ceph-dev-cron/config/definitions/ceph-dev-cron.yml b/ceph-dev-cron/config/definitions/ceph-dev-cron.yml index c70db47f..e0ed2282 100644 --- a/ceph-dev-cron/config/definitions/ceph-dev-cron.yml +++ b/ceph-dev-cron/config/definitions/ceph-dev-cron.yml @@ -30,19 +30,20 @@ browser: auto branches: - origin/main + - origin/reef - origin/quincy - origin/pacific - - origin/octopus skip-tag: true timeout: 20 wipe-workspace: true builders: - # build octopus on: - # default: focal bionic centos7 centos8 leap15 + # build pacific on: + # default: focal bionic centos8 leap15 + # crimson: centos8 - conditional-step: condition-kind: regex-match - regex: .*octopus.* + regex: .*pacific.* label: '${GIT_BRANCH}' on-evaluation-failure: dont-run steps: @@ -55,13 +56,20 @@ predefined-parameters: | BRANCH=${GIT_BRANCH} FORCE=True - DISTROS=focal bionic centos7 centos8 leap15 - # build pacific on: - # default: focal bionic centos8 leap15 + DISTROS=focal bionic centos8 leap15 + - project: 'ceph-dev' + predefined-parameters: | + BRANCH=${GIT_BRANCH} + FORCE=True + DISTROS=centos8 + FLAVOR=crimson + ARCHS=x86_64 + # build quincy on: + # default: focal centos8 centos9 leap15 # crimson: centos8 - conditional-step: condition-kind: regex-match - regex: .*pacific.* + regex: .*quincy.* label: '${GIT_BRANCH}' on-evaluation-failure: dont-run steps: @@ -74,7 +82,7 @@ predefined-parameters: | BRANCH=${GIT_BRANCH} FORCE=True - DISTROS=focal bionic centos8 leap15 + DISTROS=focal centos8 centos9 leap15 - project: 'ceph-dev' predefined-parameters: | BRANCH=${GIT_BRANCH} @@ -82,12 +90,12 @@ DISTROS=centos8 FLAVOR=crimson ARCHS=x86_64 - # build quincy on: - # default: focal centos8 centos9 leap15 + # build reef on: + # default: jammy focal centos8 centos9 windows # crimson: centos8 - conditional-step: condition-kind: regex-match - regex: .*quincy.* + regex: .*reef.* label: '${GIT_BRANCH}' on-evaluation-failure: dont-run steps: @@ -100,7 +108,7 @@ predefined-parameters: | BRANCH=${GIT_BRANCH} FORCE=True - DISTROS=focal centos8 centos9 leap15 + DISTROS=jammy focal centos8 centos9 windows - project: 'ceph-dev' predefined-parameters: | BRANCH=${GIT_BRANCH} diff --git a/ceph-dev-new-trigger/config/definitions/ceph-dev-new-trigger.yml b/ceph-dev-new-trigger/config/definitions/ceph-dev-new-trigger.yml index 41f0e2d6..9ae13a79 100644 --- a/ceph-dev-new-trigger/config/definitions/ceph-dev-new-trigger.yml +++ b/ceph-dev-new-trigger/config/definitions/ceph-dev-new-trigger.yml @@ -152,12 +152,38 @@ DISTROS=centos8 FLAVOR=crimson ARCHS=x86_64 + # build reef on: + # default: jammy focal centos8 centos9 windows + # crimson: centos8 + - conditional-step: + condition-kind: regex-match + regex: .*reef.* + label: '${GIT_BRANCH}' + on-evaluation-failure: dont-run + steps: + - shell: + !include-raw: + - ../../../scripts/build_utils.sh + - ../../build/notify + - trigger-builds: + - project: 'ceph-dev-new' + predefined-parameters: | + BRANCH=${GIT_BRANCH} + FORCE=True + DISTROS=jammy focal centos8 centos9 windows + - project: 'ceph-dev-new' + predefined-parameters: | + BRANCH=${GIT_BRANCH} + FORCE=True + DISTROS=centos8 + FLAVOR=crimson + ARCHS=x86_64 # If no release name is found in branch, build on all possible distro/flavor combos (except xenial and bionic). # regex matching and 'on-evaluation-failure: run' doesn't work here so triple negative it is. - conditional-step: condition-kind: shell condition-command: | - echo "${GIT_BRANCH}" | grep -v '\(luminous\|mimic\|nautilus\|octopus\|pacific\|quincy\|centos9-only\|crimson-only\|jaeger\)' + echo "${GIT_BRANCH}" | grep -v '\(luminous\|mimic\|nautilus\|octopus\|pacific\|quincy\|reef\|centos9-only\|crimson-only\|jaeger\)' on-evaluation-failure: dont-run steps: - shell: diff --git a/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml b/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml index 8b643bdd..270f5cf8 100644 --- a/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml +++ b/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml @@ -35,6 +35,7 @@ - 'origin/octopus' - 'origin/pacific' - 'origin/quincy' + - 'origin/reef' skip-tag: true timeout: 20 wipe-workspace: true @@ -126,6 +127,31 @@ FORCE=True DISTROS=centos8 FLAVOR=crimson + # build reef on: + # default: jammy focal centos8 centos9 + # crimson: centos8 + - conditional-step: + condition-kind: regex-match + regex: .*main.* + label: '${GIT_BRANCH}' + on-evaluation-failure: dont-run + steps: + - shell: + !include-raw: + - ../../../scripts/build_utils.sh + - ../../build/notify + - trigger-builds: + - project: 'ceph-dev' + predefined-parameters: | + BRANCH=${GIT_BRANCH} + FORCE=True + DISTROS=jammy focal centos8 centos9 + - project: 'ceph-dev' + predefined-parameters: | + BRANCH=${GIT_BRANCH} + FORCE=True + DISTROS=centos8 + FLAVOR=crimson # build main on: # default: jammy focal centos8 centos9 # crimson: centos8 diff --git a/ceph-doc-releases-rtd/config/definitions/ceph-doc-releases-rtd.yml b/ceph-doc-releases-rtd/config/definitions/ceph-doc-releases-rtd.yml index be2350d2..7e6e2c2a 100644 --- a/ceph-doc-releases-rtd/config/definitions/ceph-doc-releases-rtd.yml +++ b/ceph-doc-releases-rtd/config/definitions/ceph-doc-releases-rtd.yml @@ -35,7 +35,7 @@ - 'doc/releases' builders: - shell: | - RELEASES="quincy pacific octopus" + RELEASES="reef quincy pacific octopus" for release in $RELEASES; do curl -X POST -H "Authorization: Token $READTHEDOCS_TOKEN" https://readthedocs.org/api/v3/projects/ceph/versions/$release/builds/ done diff --git a/ceph-pr-api/config/definitions/ceph-pr-api.yml b/ceph-pr-api/config/definitions/ceph-pr-api.yml index a9cc204a..83881818 100644 --- a/ceph-pr-api/config/definitions/ceph-pr-api.yml +++ b/ceph-pr-api/config/definitions/ceph-pr-api.yml @@ -36,6 +36,7 @@ - ceph white-list-target-branches: - main + - reef - quincy - pacific - octopus diff --git a/ceph-volume-ansible-prs/build/build b/ceph-volume-ansible-prs/build/build index 22058092..c4f71ce9 100644 --- a/ceph-volume-ansible-prs/build/build +++ b/ceph-volume-ansible-prs/build/build @@ -37,6 +37,8 @@ elif [[ "$ghprbTargetBranch" == "pacific" ]]; then CEPH_ANSIBLE_BRANCH="stable-6.0" elif [[ "$ghprbTargetBranch" == "quincy" ]]; then CEPH_ANSIBLE_BRANCH="stable-7.0" +elif [[ "$ghprbTargetBranch" == "reef" ]]; then + CEPH_ANSIBLE_BRANCH="stable-8.0" else CEPH_ANSIBLE_BRANCH="main" fi diff --git a/ceph-volume-nightly/build/build b/ceph-volume-nightly/build/build index 485631c2..cebefbfb 100644 --- a/ceph-volume-nightly/build/build +++ b/ceph-volume-nightly/build/build @@ -20,6 +20,8 @@ if [[ "$CEPH_BRANCH" == "pacific" ]]; then CEPH_ANSIBLE_BRANCH="stable-6.0" elif [[ "$CEPH_BRANCH" == "quincy" ]]; then CEPH_ANSIBLE_BRANCH="stable-7.0" +elif [[ "$CEPH_BRANCH" == "reef" ]]; then + CEPH_ANSIBLE_BRANCH="stable-8.0" else CEPH_ANSIBLE_BRANCH="main" fi diff --git a/ceph-volume-nightly/config/definitions/ceph-volume-nightly.yml b/ceph-volume-nightly/config/definitions/ceph-volume-nightly.yml index 665d76f3..340ff126 100644 --- a/ceph-volume-nightly/config/definitions/ceph-volume-nightly.yml +++ b/ceph-volume-nightly/config/definitions/ceph-volume-nightly.yml @@ -12,6 +12,7 @@ - lvm ceph_branch: - main + - reef - quincy - pacific @@ -32,6 +33,7 @@ - batch ceph_branch: - main + - reef - quincy - pacific @@ -54,6 +56,7 @@ - batch ceph_branch: - main + - reef - quincy - pacific diff --git a/ceph-volume-test/config/definitions/ceph-volume-test.yml b/ceph-volume-test/config/definitions/ceph-volume-test.yml index 56371d98..a2cb61fe 100644 --- a/ceph-volume-test/config/definitions/ceph-volume-test.yml +++ b/ceph-volume-test/config/definitions/ceph-volume-test.yml @@ -33,13 +33,13 @@ default: "https://github.com/ceph/ceph.git" builders: - # centos8 based jobs for octopus & pacific & quincy & main + # centos8 based jobs for pacific & quincy & reef & main - conditional-step: condition-kind: shell condition-command: | #!/bin/bash set -x - if [[ ! "$CEPH_BRANCH" =~ main|octopus|pacific|quincy ]]; then + if [[ ! "$CEPH_BRANCH" =~ main|pacific|quincy|reef ]]; then exit 1 fi on-evaluation-failure: dont-run diff --git a/ceph-windows-pull-requests/config/definitions/ceph-windows-pull-requests.yml b/ceph-windows-pull-requests/config/definitions/ceph-windows-pull-requests.yml index afcb116a..03ff22f7 100644 --- a/ceph-windows-pull-requests/config/definitions/ceph-windows-pull-requests.yml +++ b/ceph-windows-pull-requests/config/definitions/ceph-windows-pull-requests.yml @@ -36,6 +36,7 @@ - ceph white-list-target-branches: - main + - reef - quincy trigger-phrase: 'jenkins test windows' skip-build-phrase: '^jenkins do not test.*' diff --git a/scripts/build_utils.sh b/scripts/build_utils.sh index cce078f9..82d35c3a 100755 --- a/scripts/build_utils.sh +++ b/scripts/build_utils.sh @@ -1159,7 +1159,7 @@ start_tox() { # dev runs will need to be set to the release # that matches what the current ceph main # branch is at - local release="quincy" + local release="reef" fi TOX_RUN_ENV=("timeout 3h") if [ -n "$ceph_docker_image_tag" ]; then diff --git a/scripts/sign-rpms b/scripts/sign-rpms index d7f0f7c3..8d3b24ed 100644 --- a/scripts/sign-rpms +++ b/scripts/sign-rpms @@ -21,7 +21,7 @@ keyid=460F3994 if [ $# -eq 0 ]; then # Default releases if no arguments passed - releases=( mimic nautilus octopus pacific quincy ) + releases=( pacific quincy reef ) else releases=( "$@" ) fi diff --git a/scripts/sync-push b/scripts/sync-push index 5ef48919..c4e96c6d 100644 --- a/scripts/sync-push +++ b/scripts/sync-push @@ -8,7 +8,7 @@ # Since the binaries are created with a different repository layout, this # script maps directories like "centos/6" to "rpm-$release/el6" -releases=${*:-"nautilus octopus pacific quincy"} +releases=${*:-"pacific quincy reef"} ceph_sync() { release=$1