Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tentacle kickoff! #2315

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions attic/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
- 'origin/quincy'
- 'origin/reef'
- 'origin/squid'
- 'origin/tentacle'
skip-tag: true
timeout: 20
wipe-workspace: true
Expand Down Expand Up @@ -102,6 +103,31 @@
FORCE=True
DISTROS=centos9
FLAVOR=crimson
# build tentacle on:
# default: jammy focal centos8 centos9
# crimson: centos8 centos9
- conditional-step:
condition-kind: regex-match
regex: .*tentacle.*
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=centos9
FLAVOR=crimson
# build main on:
# default: jammy focal centos8 centos9
# crimson: centos9
Expand Down
1 change: 1 addition & 0 deletions ceph-api-nightly/config/definitions/ceph-api-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
name: ceph-api-nightly
ceph_branch:
- main
- tentacle
- squid
- reef
test_suite:
Expand Down
2 changes: 1 addition & 1 deletion ceph-build/config/definitions/ceph-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
- condition-kind: and
condition-operands:
- condition-kind: regex-match
regex: (reef|squid)
regex: (reef|squid|tentacle)
label: '${BRANCH}'
- condition-kind: regex-match
regex: (focal|jammy|centos9|buster|bullseye|bookworm)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
name: ceph-dashboard-cephadm-e2e-nightly
ceph_branch:
- main
- tentacle
- squid
- reef
jobs:
Expand Down
3 changes: 3 additions & 0 deletions ceph-dev-build/build/build_osc
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
set -ex

case $RELEASE_BRANCH in
tentacle)
OBSREPO="openSUSE_Leap_15.3"
;;
squid)
OBSREPO="openSUSE_Leap_15.3"
;;
Expand Down
4 changes: 4 additions & 0 deletions ceph-dev-build/build/setup_osc
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ raw_version=`echo $vers | cut -d '-' -f 1`

RELEASE_BRANCH=$(release_from_version $raw_version)
case $RELEASE_BRANCH in
tentacle)
DISTRO=opensuse
RELEASE="15.3"
;;
squid)
DISTRO=opensuse
RELEASE="15.3"
Expand Down
27 changes: 27 additions & 0 deletions ceph-dev-cron/config/definitions/ceph-dev-cron.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
browser: auto
branches:
- origin/main
- origin/tentacle
- origin/squid
- origin/reef
skip-tag: true
Expand Down Expand Up @@ -89,6 +90,32 @@
DISTROS=centos9
FLAVOR=crimson
ARCHS=x86_64
# build tentacle on:
# default: jammy centos9 windows
# crimson: centos9
- conditional-step:
condition-kind: regex-match
regex: .*tentacle.*
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 centos9 windows
- project: 'ceph-dev'
predefined-parameters: |
BRANCH=${GIT_BRANCH}
FORCE=True
DISTROS=centos9
FLAVOR=crimson
ARCHS=x86_64
# build main on:
# default: jammy centos9 windows
# crimson: centos9
Expand Down
28 changes: 27 additions & 1 deletion ceph-dev-new-trigger/config/definitions/ceph-dev-new-trigger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,38 @@
DISTROS=centos9
FLAVOR=crimson
ARCHS=x86_64
# build tentacle on:
# default: jammy centos9 windows
# crimson: centos9
- conditional-step:
condition-kind: regex-match
regex: .*tentacle.*
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 centos9 windows
- project: 'ceph-dev-new'
predefined-parameters: |
BRANCH=${GIT_BRANCH}
FORCE=True
DISTROS=centos9
FLAVOR=crimson
ARCHS=x86_64
# If no release name is found in branch, build on all possible distro/flavor combos (except xenial, bionic, focal).
# 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 '\(reef\|squid\|centos9-only\|crimson-only\|jaeger\)'
echo "${GIT_BRANCH}" | grep -v '\(reef\|squid\|tentacle\|centos9-only\|crimson-only\|jaeger\)'
on-evaluation-failure: dont-run
steps:
- shell:
Expand Down
1 change: 1 addition & 0 deletions ceph-pr-api/config/definitions/ceph-pr-api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
- ceph
white-list-target-branches:
- main
- tentacle
- squid
- reef
- "feature-.*"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
- dmcrypt
ceph_branch:
- main
- tentacle
- squid
- reef

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
- ceph
white-list-target-branches:
- main
- tentacle
- squid
- reef
trigger-phrase: 'jenkins test windows'
Expand Down
5 changes: 4 additions & 1 deletion scripts/build_utils.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ function create_venv_dir() {
function release_from_version() {
local ver=$1
case $ver in
20.*)
rel="tentacle"
;;
19.*)
rel="squid"
;;
Expand Down Expand Up @@ -1182,7 +1185,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="squid"
local release="tentacle"
fi
TOX_RUN_ENV=("timeout 3h")
if [ -n "$ceph_docker_image_tag" ]; then
Expand Down
2 changes: 1 addition & 1 deletion scripts/sign-rpms
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ project=$1; shift

if [ $# -eq 0 ]; then
# Default releases if no arguments passed
releases=( reef squid )
releases=( reef squid tentacle )
else
releases=( "$@" )
fi
Expand Down
2 changes: 1 addition & 1 deletion scripts/sync-push
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ project=$1; shift
prerelease_dir=/data/download.ceph.com/www/prerelease/${project}

if [[ "$project" == "ceph" ]] ; then
releases=${*:-"reef squid"}
releases=${*:-"reef squid tentacle"}
else
releases=$*
fi
Expand Down