- ``Secret`` should be blank
- Select ``Just send the push event``.
-Testing JJB changes by hand, before merging to master
------------------------------------------------------
+Testing JJB changes by hand, before merging to main
+---------------------------------------------------
Sometimes it's useful to test a JJB change by hand prior to merging a pull
request.
If everything goes ok, this will cause JJB to output the XML of your job(s).
If there is a problem, JJB will print an error/backtrace instead.
-5. Run JJB to push your changes live to job on the master::
+5. Run JJB to push your changes live to job on the main::
jenkins-jobs --conf ~/.jenkins_jobs.ini update my-cool-job/config/definitions/my-cool-job.yml
6. Run a throwaway build with your change, and verify that your change didn't
break anything and does what you want it to do.
-(Note: if anyone merges anything to master during this time, Jenkins will reset
-all jobs to the state of what is in master, and your customizations will be
+(Note: if anyone merges anything to main during this time, Jenkins will reset
+all jobs to the state of what is in main, and your customizations will be
wiped out. This "by-hand" testing procedure is only intended for short-lived
tests.)
Assigning a job to a different Jenkins Master
---------------------------------------------
-We found one Jenkins master wasn't enough to handle all the jobs we were
-demanding of it. The CI now supports multiple Jenkins masters. If you wish to
-run your job on a different Jenkins master:
+We found one Jenkins controller wasn't enough to handle all the jobs we were
+demanding of it. The CI now supports multiple Jenkins controllers. If you wish to
+run your job on a different Jenkins controller:
1. Create a ``config/JENKINS_URL`` file in your job directory containing only
- the FQDN of the target Jenkins master::
+ the FQDN of the target Jenkins controller::
# Example
$ cat my-cool-job/config/JENKINS_URL
2.jenkins.ceph.com
+
+A note on inclusive language
+----------------------------
+
+Like many software projects, the Ceph project has undertaken the task of
+migrating to more inclusive language. In the Ceph CI,
+
+``master`` branches are now ``main``
+
+``slave`` is now ``builder``
+
+When referring to the main Jenkins server, ``master`` is now ``controller``
+
+Remaining references (like the Jenkins ``ssh-slaves`` plugin) are hardcoded
+and could not be changed.
- git:
url: https://github.com/ceph/ceph-ansible
branches:
- - master
+ - main
- stable-2.1
- stable-2.2
- stable-3.0
- git:
url: https://github.com/ceph/ceph-ansible.git
branches:
- - master
+ - main
browser: auto
basedir: "ceph-ansible"
timeout: 20
stable-*)
CEPH_DOCKER_IMAGE_TAG=$(find_latest_tag "$RELEASE")
;;
- master)
- CEPH_DOCKER_IMAGE_TAG="latest-master"
+ main)
+ CEPH_DOCKER_IMAGE_TAG="latest-main"
;;
esac
- string:
name: BRANCH
description: "The ceph-ansible branch to test against"
- default: "master"
+ default: "main"
- string:
name: CEPH_DEV_BRANCH
description: "The ceph dev branch to test against if using a dev-* scenario"
- default: "master"
+ default: "main"
- string:
name: CEPH_DEV_SHA1
description: "The ceph sha1 to test against if using a dev-* scenario"
- project:
name: ceph-api-nightly
ceph_branch:
- - master
+ - main
- quincy
- pacific
- octopus
- git:
url: https://github.com/ceph/ceph-container.git
branches:
- - master
+ - main
browser: auto
basedir: "ceph-container"
timeout: 20
- git:
url: https://github.com/ceph/ceph-container.git
branches:
- - master
+ - main
browser: auto
basedir: "ceph-container"
timeout: 20
- git:
url: https://github.com/ceph/ceph-container.git
branches:
- - master
+ - main
browser: auto
basedir: "ceph-container"
timeout: 20
- git:
url: https://github.com/ceph/ceph-container.git
branches:
- - master
+ - main
browser: auto
basedir: "ceph-container"
timeout: 20
- git:
url: https://github.com/ceph/ceph-container.git
branches:
- - master
+ - main
browser: auto
basedir: "ceph-container"
timeout: 20
- string:
name: BRANCH
description: "A ceph-container branch to test"
- default: master
+ default: main
triggers:
- timed: '@daily'
- project:
name: ceph-dashboard-cephadm-e2e-nightly
ceph_branch:
- - master
+ - main
- quincy
- pacific
- octopus
- git:
url: https://github.com/ceph/ceph-deploy
branches:
- - master
+ - main
browser: auto
skip-tag: true
timeout: 20
wipe-workspace: true
basedir: "ceph-build"
branches:
- - origin/master
+ - origin/main
- job:
name: ceph-deploy-tag
- string:
name: BRANCH
description: "The git branch (or tag) to build"
- default: "master"
+ default: "main"
- string:
name: VERSION
description: "The version for release, e.g. 1.5.30"
parameters:
- string:
name: BRANCH
- description: "The git branch or tag to build. Defaults to master"
- default: "master"
+ description: "The git branch or tag to build. Defaults to main"
+ default: "main"
- bool:
name: TEST
url: https://github.com/ceph/ceph
browser: auto
branches:
- - origin/master
+ - origin/main
- origin/quincy
- origin/pacific
- origin/octopus
DISTROS=centos8
FLAVOR=crimson
ARCHS=x86_64
- # build master on:
+ # build main on:
# default: focal centos8 windows
# crimson: centos8
- conditional-step:
condition-kind: regex-match
- regex: .*master.*
+ regex: .*main.*
label: '${GIT_BRANCH}'
on-evaluation-failure: dont-run
steps:
- string:
name: BRANCH
description: "The git branch (or tag) to build"
- default: master
+ default: main
- string:
name: DISTROS
- string:
name: CONTAINER_BRANCH
description: "For CI_CONTAINER: Branch of ceph-container to use"
- default: master
+ default: main
- string:
name: CONTAINER_REPO_HOSTNAME
url: https://github.com/ceph/ceph
browser: auto
branches:
- - 'origin/master'
+ - 'origin/main'
- 'origin/jewel'
- 'origin/kraken'
- 'origin/hammer'
FORCE=True
DISTROS=centos8
FLAVOR=crimson
- # build master on:
+ # build main on:
# default: focal centos8
# crimson: centos8
- conditional-step:
condition-kind: regex-match
- regex: .*master.*
+ regex: .*main.*
label: '${GIT_BRANCH}'
on-evaluation-failure: dont-run
steps:
- string:
name: BRANCH
description: "The git branch (or tag) to build"
- default: master
+ default: main
- string:
name: DISTROS
- string:
name: CONTAINER_BRANCH
description: "For CI_CONTAINER: Branch of ceph-container to use"
- default: master
+ default: main
- string:
name: CONTAINER_REPO_HOSTNAME
# The default is to build and publish every branch.
# Uncomment this for testing:
#branches:
- # - 'origin/master'
+ # - 'origin/main'
skip-tag: true
timeout: 20
wipe-workspace: true
- string:
name: BRANCH
description: "The git branch (or tag) to build"
- default: master
+ default: main
- string:
name: CONTAINER_VERSION
description: "The version tag for the containers; will have -ARCH added to it. By convention, the version of Grafana"
- string:
name: BRANCH
description: "The git branch (or tag) to build"
- default: master
+ default: main
- string:
name: ARCH
description: "Architecture to build for. Available options are: x86_64, arm64"
- git:
url: https://github.com/ceph/ceph-iscsi-cli.git
branches:
- - 'origin/master*'
+ - 'origin/main*'
- 'origin/wip*'
skip-tag: true
timeout: 20
- string:
name: BRANCH
description: "The git branch (or tag) to build"
- default: "master"
+ default: "main"
- string:
name: DISTROS
- git:
url: https://github.com/ceph/ceph-iscsi-config.git
branches:
- - 'origin/master*'
+ - 'origin/main*'
- 'origin/wip*'
skip-tag: true
timeout: 20
- string:
name: BRANCH
description: "The git branch (or tag) to build"
- default: "master"
+ default: "main"
- string:
name: DISTROS
- git:
url: https://github.com/ceph/ceph-iscsi-tools.git
branches:
- - 'origin/master*'
+ - 'origin/main*'
- 'origin/wip*'
skip-tag: true
timeout: 20
- string:
name: BRANCH
description: "The git branch (or tag) to build"
- default: "master"
+ default: "main"
- string:
name: DISTROS
- git:
url: https://github.com/ceph/ceph-iscsi.git
branches:
- - 'origin/master*'
+ - 'origin/main*'
- 'origin/wip*'
skip-tag: true
timeout: 20
- string:
name: BRANCH
description: "The git branch (or tag) to build"
- default: "master"
+ default: "main"
- string:
name: DISTROS
- git:
url: https://github.com/ceph/ceph-medic
branches:
- - master
+ - main
# as more stable branches are published, they need to be
# added here
#- stable-1.0
- string:
name: BRANCH
description: "The git branch (or tag) to build"
- default: "master"
+ default: "main"
- string:
name: DISTROS
- project:
name: ceph-medic-tests
- # disabled because it is broken with current ceph-ansible master and there
+ # disabled because it is broken with current ceph-ansible main and there
# is no active development going on
disabled: true
scenario:
- string:
name: CEPH_MEDIC_BRANCH
description: "The ceph-medic branch to test"
- default: master
+ default: main
- string:
name: CEPH_ANSIBLE_BRANCH
description: "The ceph-ansible branch to test"
- default: master
+ default: main
triggers:
- timed: '@daily'
# macros
- scm:
- name: ceph-master
+ name: ceph-main
scm:
- git:
url: https://github.com/ceph/ceph.git
branches:
- - origin/master
+ - origin/main
skip-tag: true
timeout: 20
- basedir: "ceph-master"
+ basedir: "ceph-main"
shallow-clone: true
wipe-workspace: true
scm:
- git:
url: https://github.com/ceph/cbt.git
- refspec: +refs/heads/master:refs/remotes/origin/master
+ refspec: +refs/heads/main:refs/remotes/origin/main
do-not-fetch-tags: true
honor-refspec: true
name: origin
branches:
- - refs/heads/master
+ - refs/heads/main
timeout: 20
wipe-workspace: false
basedir: "cbt"
name: compare-cbt-results
builders:
- shell: |
- cd ${{WORKSPACE}}/{src-dir-master}
- archive_dir_master={archive-master}/$(git rev-parse --short HEAD)
+ cd ${{WORKSPACE}}/{src-dir-main}
+ archive_dir_main={archive-main}/$(git rev-parse --short HEAD)
cd ${{WORKSPACE}}/{src-dir-pr}
archive_dir_pr={archive-pr}/$(git rev-parse --short HEAD)
. ${{WORKSPACE}}/gh-venv/bin/activate
${{WORKSPACE}}/cbt/compare.py -v \
-a $archive_dir_pr \
- -b $archive_dir_master \
+ -b $archive_dir_main \
--output report.md && result=success || result=failure
github-check \
--owner {check-repo-owner} \
cancel-builds-on-update: true
scm:
- - ceph-master
+ - ceph-main
- ceph-pr
- cbt
# so clang is able to find gcc-toolset-${{gcc_toolset_ver}} which is listed as a
# BuildRequires in ceph.spec.in, and it is installed by `run-make.sh`.
# clang searches for GCC in a bunch of well known places:
- # see https://github.com/llvm-mirror/clang/blob/master/lib/Driver/ToolChains/Gnu.cpp
+ # see https://github.com/llvm-mirror/clang/blob/main/lib/Driver/ToolChains/Gnu.cpp
sudo ln -sf /opt/rh/gcc-toolset-${{gcc_toolset_ver}}/root/lib/gcc/x86_64-redhat-linux/${{gcc_toolset_ver}} \
/usr/lib/gcc/x86_64-redhat-linux/${{gcc_toolset_ver}}
;;
--summary running
- run-cbt:
- src-dir: "ceph-master"
+ src-dir: "ceph-main"
osd-flavor: '{osd-flavor}'
# ideally cbt-results should be persited across jobs, so the test result can be reused
archive-basedir: "$WORKSPACE/cbt-results"
# use the basedir of git checkout, so it can be wiped
archive-basedir: "$WORKSPACE/ceph-pr"
- compare-cbt-results:
- src-dir-master: "ceph-master"
- archive-master: "$WORKSPACE/cbt-results"
+ src-dir-main: "ceph-main"
+ archive-main: "$WORKSPACE/cbt-results"
src-dir-pr: "ceph-pr"
archive-pr: "$WORKSPACE/ceph-pr"
check-app-id: '{check-app-id}'
org-list:
- ceph
white-list-target-branches:
- - master
+ - main
- quincy
- pacific
- octopus
"""
This class will contain all checks required for commits
"""
- target_branch = os.getenv('ghprbTargetBranch', 'master')
+ target_branch = os.getenv('ghprbTargetBranch', 'main')
source_branch = 'HEAD'
workspace = os.getenv('WORKSPACE') or dirname(
@classmethod
def setup_class(cls):
- # ensure that we have the latest commits from master
+ # ensure that we have the latest commits from main
cls.command(
'git fetch origin +refs/heads/{target_branch}:refs/remotes/origin/{target_branch}'.format(
target_branch=cls.target_branch))
raise AssertionError("\n".join([
"The title/s of following commit/s is/are not started with 'doc', but they only touch files under 'doc/'. Please make sure the commit titles",
"are started with 'doc'. See the 'Submitting Patches' guide:",
- "https://github.com/ceph/ceph/blob/master/SubmittingPatches.rst#commit-title",
+ "https://github.com/ceph/ceph/blob/main/SubmittingPatches.rst#commit-title",
""] +
wrong_commits
))
raise AssertionError("\n".join([
"Following commit/s is/are not signed, please make sure all TestCommits",
"are signed following the 'Submitting Patches' guide:",
- "https://github.com/ceph/ceph/blob/master/SubmittingPatches.rst#1-sign-your-work",
+ "https://github.com/ceph/ceph/blob/main/SubmittingPatches.rst#1-sign-your-work",
""] +
wrong_commits
))
- git:
url: https://github.com/ceph/ceph-build.git
branches:
- - origin/master
+ - origin/main
browser-url: https://github.com/ceph/ceph-build
timeout: 20
skip-tag: true
- string:
name: ghprbPullId
description: "the GitHub pull id, like '72' in 'ceph/pull/72'"
- default: origin/master
+ default: origin/main
project-type: freestyle
properties:
- build-discarder:
success-status: "make check succeeded"
failure-status: "make check failed"
white-list-target-branches:
- - master
+ - main
wrappers:
- credentials-binding:
- username-password-separated:
wipe-workspace: true
basedir: "ceph-build"
branches:
- - origin/master
+ - origin/main
builders:
elif [[ "$ghprbTargetBranch" == "pacific" ]]; then
CEPH_ANSIBLE_BRANCH="stable-6.0"
else
- CEPH_ANSIBLE_BRANCH="master"
+ CEPH_ANSIBLE_BRANCH="main"
fi
if [[ "$ghprbTargetBranch" == "nautilus" ]]; then
description: "When manually triggered, and the remote PR isn't a branch in the ceph.git repo This can be specified to determine the actual branch."
- string:
name: ghprbTargetBranch
- description: 'Required when manually triggered, the targeted branch needs to be set (e.g. "luminous" or "master")'
+ description: 'Required when manually triggered, the targeted branch needs to be set (e.g. "luminous" or "main")'
- string:
name: GITHUB_SHA
description: "The tip (last commit) in the PR, a sha1 like 7d787849556788961155534039886aedfcdb2a88 (if set, will report status to Github)"
if [ "$CEPH_BRANCH" = "nautilus" ]; then
CEPH_ANSIBLE_BRANCH="stable-4.0"
else
- CEPH_ANSIBLE_BRANCH="master"
+ CEPH_ANSIBLE_BRANCH="main"
fi
subcommand:
- lvm
ceph_branch:
- - master
+ - main
- nautilus
exclude:
- - ceph_branch: master
+ - ceph_branch: main
distro: centos7
- ceph_branch: nautilus
distro: centos8
- - ceph_branch: master
+ - ceph_branch: main
distro: xenial
- ceph_branch: nautilus
distro: xenial
subcommand:
- batch
ceph_branch:
- - master
+ - main
- nautilus
exclude:
- - ceph_branch: master
+ - ceph_branch: main
distro: centos7
- ceph_branch: nautilus
distro: centos8
- - ceph_branch: master
+ - ceph_branch: main
distro: xenial
- ceph_branch: nautilus
distro: xenial
subcommand:
- batch
ceph_branch:
- - master
+ - main
- nautilus
exclude:
- - ceph_branch: master
+ - ceph_branch: main
distro: centos7
- ceph_branch: nautilus
distro: centos8
- - ceph_branch: master
+ - ceph_branch: main
distro: xenial
- ceph_branch: nautilus
distro: xenial
description: "When manually triggered, and the remote PR isn't a branch in the ceph.git repo This can be specified to determine the actual branch."
- string:
name: ghprbTargetBranch
- description: 'Required when manually triggered, the targeted branch needs to be set (e.g. "luminous" or "master")'
+ description: 'Required when manually triggered, the targeted branch needs to be set (e.g. "luminous" or "main")'
- string:
name: GITHUB_SHA
description: "The tip (last commit) in the PR, a sha1 like 7d787849556788961155534039886aedfcdb2a88 (if set, will report status to Github)"
- string:
name: CEPH_BRANCH
description: "The ceph branch to test against"
- default: "master"
+ default: "main"
- string:
name: CEPH_SHA1
description: "The ceph sha1 to test against"
- string:
name: CEPH_ANSIBLE_BRANCH
description: "The ceph-ansible branch to test against"
- default: "master"
+ default: "main"
- string:
name: CEPH_REPO_URL
description: "The full https url to clone from"
- string:
name: CEPH_BRANCH
description: "The ceph branch to test against"
- default: "master"
+ default: "main"
- string:
name: CEPH_SHA1
description: "The ceph sha1 to test against"
- string:
name: CEPH_ANSIBLE_BRANCH
description: "The ceph-ansible branch to test against"
- default: "master"
+ default: "main"
- string:
name: CEPH_REPO_URL
description: "The full https url to clone from"
default: "https://github.com/ceph/ceph.git"
builders:
- # centos8 based jobs for octopus & pacific & quincy & master
+ # centos8 based jobs for octopus & pacific & quincy & main
- conditional-step:
condition-kind: shell
condition-command: |
#!/bin/bash
set -x
- if [[ ! "$CEPH_BRANCH" =~ master|octopus|pacific|quincy ]]; then
+ if [[ ! "$CEPH_BRANCH" =~ main|octopus|pacific|quincy ]]; then
exit 1
fi
on-evaluation-failure: dont-run
$PYTHON3_URL = "https://www.python.org/ftp/python/3.10.1/python-3.10.1-amd64.exe"
$WNBD_GIT_REPO = "https://github.com/ceph/wnbd.git"
-$WNBD_GIT_BRANCH = "master"
+$WNBD_GIT_BRANCH = "main"
function Get-WindowsBuildInfo {
- git:
url: https://github.com/ceph/ceph-build.git
branches:
- - master
+ - main
basedir: ceph-build
builders:
set -o errexit
set -o pipefail
-CEPH_WINDOWS_BRANCH=${CEPH_WINDOWS_BRANCH:-"master"}
+CEPH_WINDOWS_BRANCH=${CEPH_WINDOWS_BRANCH:-"main"}
CEPH_WINDOWS_SHA1=${CEPH_WINDOWS_SHA1:-"latest"}
-WNBD_BRANCH=${WNBD_BRANCH:-"master"}
+WNBD_BRANCH=${WNBD_BRANCH:-"main"}
WNBD_SHA1=${WNBD_SHA1:-"latest"}
-GET_BIN_SCRIPT_URL="https://raw.githubusercontent.com/ceph/ceph-win32-tests/master/get-bin.py"
+GET_BIN_SCRIPT_URL="https://raw.githubusercontent.com/ceph/ceph-win32-tests/main/get-bin.py"
DISTRO="windows"
DISTRO_VERSION="1809"
- string:
name: BRANCH
description: "The git branch (or tag) to build"
- default: "master"
+ default: main
- string:
name: CEPH_WINDOWS_BRANCH
description: "The branch name for the Ceph build."
- default: master
+ default: main
- string:
name: CEPH_WINDOWS_SHA1
- string:
name: WNBD_BRANCH
description: "The branch name for the WNBD build."
- default: master
+ default: main
- string:
name: WNBD_SHA1
org-list:
- ceph
white-list-target-branches:
- - master
+ - main
- quincy
trigger-phrase: 'jenkins test windows'
skip-build-phrase: '^jenkins do not test.*'
set -o pipefail
CEPH_WINDOWS_VERSION=${CEPH_WINDOWS_VERSION:-"1809"}
-CEPH_WINDOWS_BRANCH=${CEPH_WINDOWS_BRANCH:-"master"}
+CEPH_WINDOWS_BRANCH=${CEPH_WINDOWS_BRANCH:-"main"}
CEPH_WINDOWS_SHA1=${CEPH_WINDOWS_SHA1:-"latest"}
-GET_BIN_SCRIPT_URL="https://raw.githubusercontent.com/ceph/ceph-win32-tests/master/get-bin.py"
+GET_BIN_SCRIPT_URL="https://raw.githubusercontent.com/ceph/ceph-win32-tests/main/get-bin.py"
#
# Download the Chacra Ceph Windows build
- string:
name: CEPH_WINDOWS_BRANCH
description: "The branch name for the Ceph build."
- default: master
+ default: main
- string:
name: CEPH_WINDOWS_SHA1
description: "The SHA1 for the Ceph build."
parameters:
- string:
name: BRANCH
- description: "The git BRANCH to build (e.g., pacific)"
- default: master
+ description: "The git branch (or tag) to build (e.g., pacific)"
+ default: main
- bool:
name: TEST
- string:
name: BRANCH
description: "The git branch (or tag) to build"
- default: "master"
+ default: "main"
- string:
name: DISTROS
- string:
name: BRANCH
description: "The git branch (or tag) to build"
- default: "master"
+ default: "main"
- string:
name: DISTROS
wipe-workspace: false
basedir: "ceph-build"
branches:
- - origin/master
+ - origin/main
- job:
- string:
name: BRANCH
description: "The git branch (or tag) to build"
- default: "master"
+ default: main
- string:
name: DISTROS
- string:
name: BRANCH
description: "The git branch (or tag) to build"
- default: master
+ default: main
- string:
name: DISTROS
<name>origin/testing</name>
</hudson.plugins.git.BranchSpec>
<hudson.plugins.git.BranchSpec>
- <name>origin/master</name>
+ <name>origin/main</name>
</hudson.plugins.git.BranchSpec>
<hudson.plugins.git.BranchSpec>
<name>origin/for-linus</name>
- string:
name: CEPH_BRANCH
description: "The branch of Ceph to get the repo file of for libcephfs"
- default: "master"
+ default: main
- string:
name: DISTROS
- git:
url: https://github.com/ceph/ceph-build.git
branches:
- - origin/master
+ - origin/main
browser-url: https://github.com/ceph/ceph-build
timeout: 20
basedir: "ceph-build"
- string:
name: BRANCH
description: "The git branch or tag to build"
- default: master
+ default: main
- bool:
name: RELEASE
- git:
url: https://github.com/ceph/rtslib-fb.git
branches:
- - 'origin/master*'
+ - 'origin/main*'
- 'origin/testing*'
- 'origin/wip*'
skip-tag: true
- string:
name: BRANCH
description: "The git branch (or tag) to build"
- default: "master"
+ default: main
- string:
name: DISTROS
url: https://github.com/ceph/samba.git
branches:
- 'origin/ceph*'
- - 'origin/master*'
+ - 'origin/main*'
- 'origin/wip-*'
skip-tag: true
timeout: 20
- string:
name: SAMBA_BRANCH
description: "The git branch (or tag) to build"
- default: "master"
+ default: main
- string:
name: CEPH_SHA1
- string:
name: CEPH_BRANCH
description: "The branch of Ceph to get the repo file of for libcephfs"
- default: "master"
+ default: main
- string:
name: DISTROS
done
if [ "$release" = "dev" ]; then
# dev runs will need to be set to the release
- # that matches what the current ceph master
+ # that matches what the current ceph main
# branch is at
local release="quincy"
fi
" | sudo tee /usr/local/bin/kcli
sudo chmod +x /usr/local/bin/kcli
-# KCLI cleanup function can be found here: https://github.com/ceph/ceph/blob/master/src/pybind/mgr/dashboard/ci/cephadm/start-cluster.sh
+# KCLI cleanup function can be found here: https://github.com/ceph/ceph/blob/main/src/pybind/mgr/dashboard/ci/cephadm/start-cluster.sh
sudo mkdir -p /var/lib/libvirt/images/ceph-dashboard
kcli delete plan ceph -y || true
kcli delete network ceph-dashboard -y
See https://wiki.sepia.ceph.com/doku.php?id=services:fog
.. _FOG: https://fogproject.org/
-.. _jenkins-build.pub: https://github.com/ceph/keys/blob/master/ssh/jenkins-build.pub
+.. _jenkins-build.pub: https://github.com/ceph/keys/blob/main/ssh/jenkins-build.pub
.. _teuthology.yaml: http://docs.ceph.com/teuthology/docs/siteconfig.html
.. _ceph-sepia-secrets: https://github.com/ceph/ceph-sepia-secrets/
-.. _tools: https://github.com/ceph/ceph-cm-ansible/tree/master/tools
+.. _tools: https://github.com/ceph/ceph-cm-ansible/tree/main/tools
.. _Jenkins: https://jenkins.ceph.com/job/sepia-fog-images
-.. _task: https://github.com/ceph/ceph-cm-ansible/blob/master/roles/cobbler/templates/snippets/cephlab_rc_local
+.. _task: https://github.com/ceph/ceph-cm-ansible/blob/main/roles/cobbler/templates/snippets/cephlab_rc_local
.. _ceph-cm-ansible: https://github.com/ceph/ceph-cm-ansible
git checkout $TEUTHOLOGYBRANCH
else
cd teuthology
- git checkout master
+ git checkout main
git pull
git checkout $TEUTHOLOGYBRANCH
fi
git checkout $CMANSIBLEBRANCH
else
cd ceph-cm-ansible
- git checkout master
+ git checkout main
git pull
git checkout $CMANSIBLEBRANCH
fi
description: "Machine types to capture images for. (e.g., 'smithi' or 'smithi mira' for multiple machine types)"
- string:
name: TEUTHOLOGYBRANCH
- default: "master"
+ default: main
description: "Optionally define a different teuthology branch (useful for testing)"
- string:
name: CMANSIBLEBRANCH
- default: "master"
+ default: main
description: "Optionally define a different ceph-cm-ansible branch (useful for testing)"
- string:
name: PAUSEQUEUE
wipe-workspace: false
basedir: "ceph-build"
branches:
- - origin/master
+ - origin/main
- job:
- git:
url: https://github.com/ceph/tcmu-runner.git
branches:
- - 'origin/master*'
+ - 'origin/main*'
- 'origin/testing*'
- 'origin/wip*'
skip-tag: true
- string:
name: BRANCH
description: "The git branch (or tag) to build"
- default: "master"
+ default: main
- string:
name: CEPH_SHA1
- string:
name: CEPH_BRANCH
description: "The branch of Ceph to get the repo file of for libcephfs"
- default: "master"
+ default: main
- string:
name: DISTROS
- git:
url: https://github.com/ceph/teuthology.git
branches:
- - master
+ - main
browser: auto
timeout: 20
- string:
name: BRANCH
description: "The git branch (or tag) to build"
- default: "master"
+ default: main
- bool:
name: THROWAWAY
projects / ceph-build.git / commitdiff