From 39e983f0198c3755871a851425b6ffa1ede7b12f Mon Sep 17 00:00:00 2001 From: David Galloway Date: Tue, 22 Feb 2022 14:59:36 -0500 Subject: [PATCH] master-> main Signed-off-by: David Galloway --- README.rst | 33 ++++++++++++++----- .../config/definitions/ceph-ansible-docs.yml | 2 +- .../definitions/ceph-ansible-galaxy.yml | 2 +- ceph-ansible-nightly/build/build | 4 +-- .../definitions/ceph-ansible-scenario.yml | 4 +-- .../config/definitions/ceph-api-nightly.yml | 2 +- .../ceph-container-build-push-imgs.yml | 2 +- .../ceph-container-build-push-imgs.yml | 2 +- .../ceph-container-build-push-imgs-arm64.yml | 2 +- ...ontainer-build-push-imgs-devel-nightly.yml | 2 +- .../ceph-container-build-push-imgs.yml | 2 +- .../definitions/ceph-container-nightly.yml | 2 +- .../ceph-dashboard-cephadm-e2e-nightly.yml | 2 +- .../config/definitions/ceph-deploy-docs.yml | 2 +- .../config/definitions/ceph-tag.yml | 4 +-- .../config/definitions/ceph-deploy.yml | 4 +-- .../config/definitions/ceph-dev-cron.yml | 6 ++-- .../config/definitions/ceph-dev-new.yml | 4 +-- .../config/definitions/ceph-dev-trigger.yml | 6 ++-- ceph-dev/config/definitions/ceph-dev.yml | 4 +-- ceph-docs/config/definitions/ceph-docs.yml | 2 +- .../definitions/ceph-grafana-trigger.yml | 2 +- .../config/definitions/ceph-grafana.yml | 2 +- .../definitions/ceph-iscsi-cli-trigger.yml | 2 +- .../config/definitions/ceph-iscsi-cli.yml | 2 +- .../definitions/ceph-iscsi-config-trigger.yml | 2 +- .../config/definitions/ceph-iscsi-config.yml | 2 +- .../definitions/ceph-iscsi-tools-trigger.yml | 2 +- .../config/definitions/ceph-iscsi-tools.yml | 2 +- .../config/definitions/ceph-iscsi-trigger.yml | 2 +- ceph-iscsi/config/definitions/ceph-iscsi.yml | 2 +- .../config/definitions/ceph-medic-docs.yml | 2 +- .../config/definitions/ceph-medic-release.yml | 2 +- .../config/definitions/ceph-medic-tests.yml | 6 ++-- .../definitions/ceph-perf-pull-requests.yml | 26 +++++++-------- .../config/definitions/ceph-pr-api.yml | 2 +- ceph-pr-commits/build/test_commits.py | 8 ++--- .../config/definitions/ceph-pr-commits.yml | 2 +- .../definitions/ceph-pull-requests-arm64.yml | 4 +-- ceph-tag/config/definitions/ceph-tag.yml | 2 +- ceph-volume-ansible-prs/build/build | 2 +- .../config/definitions/ceph-volume-pr.yml | 2 +- ceph-volume-nightly/build/build | 2 +- .../definitions/ceph-volume-nightly.yml | 18 +++++----- .../config/definitions/ceph-volume-pr.yml | 2 +- .../definitions/ceph-volume-scenario.yml | 4 +-- .../config/definitions/ceph-volume-test.yml | 8 ++--- ceph-windows-image-build/build/setup.ps1 | 2 +- .../definitions/ceph-windows-image-build.yml | 2 +- ceph-windows-installer-build/build/setup | 6 ++-- .../ceph-windows-installer-build.yml | 6 ++-- .../ceph-windows-pull-requests.yml | 2 +- ceph-windows-test/build/get_chacra_build | 4 +-- .../config/definitions/ceph-windows-test.yml | 2 +- ceph/config/definitions/ceph.yml | 4 +-- .../definitions/cephmetrics-release.yml | 2 +- .../config/definitions/cephmetrics.yml | 2 +- .../definitions/chacra-pull-requests.yml | 2 +- .../config/definitions/configshell-fb.yml | 2 +- diamond/config/definitions/diamond.yml | 2 +- .../config/definitions/kernel-trigger.yml | 2 +- .../config/definitions/nfs-ganesha.yml | 2 +- .../config/definitions/quay-pruner.yml | 2 +- .../config/definitions/radosgw-agent.yml | 2 +- .../config/definitions/rtslib-fb-trigger.yml | 2 +- rtslib-fb/config/definitions/rtslib-fb.yml | 2 +- .../config/definitions/samba-trigger.yml | 2 +- samba/config/definitions/samba.yml | 4 +-- scripts/build_utils.sh | 2 +- scripts/dashboard/install-cephadm-e2e-deps.sh | 2 +- sepia-fog-images/README.rst | 6 ++-- sepia-fog-images/build/build | 4 +-- .../config/definitions/sepia-fog-images.yml | 4 +-- .../definitions/shaman-pull-requests.yml | 2 +- .../definitions/tcmu-runner-trigger.yml | 2 +- .../config/definitions/tcmu-runner.yml | 4 +-- .../config/definitions/teuthology-docs.yml | 2 +- wnbd-build/config/definitions/wnbd-build.yml | 2 +- 78 files changed, 153 insertions(+), 138 deletions(-) diff --git a/README.rst b/README.rst index 5e40fdf1..ba6a04e3 100644 --- a/README.rst +++ b/README.rst @@ -204,8 +204,8 @@ See the "jenkins-job-builder" job as an example. - ``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. @@ -237,28 +237,43 @@ Let's say this git branch makes a change in the ``my-cool-job`` job. 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. diff --git a/ceph-ansible-docs/config/definitions/ceph-ansible-docs.yml b/ceph-ansible-docs/config/definitions/ceph-ansible-docs.yml index 552163fc..15fa7849 100644 --- a/ceph-ansible-docs/config/definitions/ceph-ansible-docs.yml +++ b/ceph-ansible-docs/config/definitions/ceph-ansible-docs.yml @@ -24,7 +24,7 @@ - git: url: https://github.com/ceph/ceph-ansible branches: - - master + - main - stable-2.1 - stable-2.2 - stable-3.0 diff --git a/ceph-ansible-galaxy/config/definitions/ceph-ansible-galaxy.yml b/ceph-ansible-galaxy/config/definitions/ceph-ansible-galaxy.yml index f7c3e1f9..18ff8a8b 100644 --- a/ceph-ansible-galaxy/config/definitions/ceph-ansible-galaxy.yml +++ b/ceph-ansible-galaxy/config/definitions/ceph-ansible-galaxy.yml @@ -24,7 +24,7 @@ - git: url: https://github.com/ceph/ceph-ansible.git branches: - - master + - main browser: auto basedir: "ceph-ansible" timeout: 20 diff --git a/ceph-ansible-nightly/build/build b/ceph-ansible-nightly/build/build index 845dce59..b22090cb 100644 --- a/ceph-ansible-nightly/build/build +++ b/ceph-ansible-nightly/build/build @@ -42,8 +42,8 @@ function run_tox { stable-*) CEPH_DOCKER_IMAGE_TAG=$(find_latest_tag "$RELEASE") ;; - master) - CEPH_DOCKER_IMAGE_TAG="latest-master" + main) + CEPH_DOCKER_IMAGE_TAG="latest-main" ;; esac diff --git a/ceph-ansible-scenario/config/definitions/ceph-ansible-scenario.yml b/ceph-ansible-scenario/config/definitions/ceph-ansible-scenario.yml index d2994844..687950ea 100644 --- a/ceph-ansible-scenario/config/definitions/ceph-ansible-scenario.yml +++ b/ceph-ansible-scenario/config/definitions/ceph-ansible-scenario.yml @@ -25,11 +25,11 @@ - 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" diff --git a/ceph-api-nightly/config/definitions/ceph-api-nightly.yml b/ceph-api-nightly/config/definitions/ceph-api-nightly.yml index 80de662b..661126cf 100644 --- a/ceph-api-nightly/config/definitions/ceph-api-nightly.yml +++ b/ceph-api-nightly/config/definitions/ceph-api-nightly.yml @@ -1,7 +1,7 @@ - project: name: ceph-api-nightly ceph_branch: - - master + - main - quincy - pacific - octopus diff --git a/ceph-container-build-ceph-base-push-imgs-arm64/config/definitions/ceph-container-build-push-imgs.yml b/ceph-container-build-ceph-base-push-imgs-arm64/config/definitions/ceph-container-build-push-imgs.yml index 9449caf7..7c30c21a 100644 --- a/ceph-container-build-ceph-base-push-imgs-arm64/config/definitions/ceph-container-build-push-imgs.yml +++ b/ceph-container-build-ceph-base-push-imgs-arm64/config/definitions/ceph-container-build-push-imgs.yml @@ -24,7 +24,7 @@ - git: url: https://github.com/ceph/ceph-container.git branches: - - master + - main browser: auto basedir: "ceph-container" timeout: 20 diff --git a/ceph-container-build-ceph-base-push-imgs/config/definitions/ceph-container-build-push-imgs.yml b/ceph-container-build-ceph-base-push-imgs/config/definitions/ceph-container-build-push-imgs.yml index 30e2988d..fd25013b 100644 --- a/ceph-container-build-ceph-base-push-imgs/config/definitions/ceph-container-build-push-imgs.yml +++ b/ceph-container-build-ceph-base-push-imgs/config/definitions/ceph-container-build-push-imgs.yml @@ -24,7 +24,7 @@ - git: url: https://github.com/ceph/ceph-container.git branches: - - master + - main browser: auto basedir: "ceph-container" timeout: 20 diff --git a/ceph-container-build-push-imgs-arm64/config/definitions/ceph-container-build-push-imgs-arm64.yml b/ceph-container-build-push-imgs-arm64/config/definitions/ceph-container-build-push-imgs-arm64.yml index d04acd59..fff791df 100644 --- a/ceph-container-build-push-imgs-arm64/config/definitions/ceph-container-build-push-imgs-arm64.yml +++ b/ceph-container-build-push-imgs-arm64/config/definitions/ceph-container-build-push-imgs-arm64.yml @@ -24,7 +24,7 @@ - git: url: https://github.com/ceph/ceph-container.git branches: - - master + - main browser: auto basedir: "ceph-container" timeout: 20 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 66e7d737..b1d388bf 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 @@ -24,7 +24,7 @@ - git: url: https://github.com/ceph/ceph-container.git branches: - - master + - main browser: auto basedir: "ceph-container" timeout: 20 diff --git a/ceph-container-build-push-imgs/config/definitions/ceph-container-build-push-imgs.yml b/ceph-container-build-push-imgs/config/definitions/ceph-container-build-push-imgs.yml index 30e2652c..07d78e95 100644 --- a/ceph-container-build-push-imgs/config/definitions/ceph-container-build-push-imgs.yml +++ b/ceph-container-build-push-imgs/config/definitions/ceph-container-build-push-imgs.yml @@ -24,7 +24,7 @@ - git: url: https://github.com/ceph/ceph-container.git branches: - - master + - main browser: auto basedir: "ceph-container" timeout: 20 diff --git a/ceph-container-nighlity/config/definitions/ceph-container-nightly.yml b/ceph-container-nighlity/config/definitions/ceph-container-nightly.yml index bd76bd81..da800a99 100644 --- a/ceph-container-nighlity/config/definitions/ceph-container-nightly.yml +++ b/ceph-container-nighlity/config/definitions/ceph-container-nightly.yml @@ -30,7 +30,7 @@ - string: name: BRANCH description: "A ceph-container branch to test" - default: master + default: main triggers: - timed: '@daily' 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 9923d734..1ee266f5 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 @@ -1,7 +1,7 @@ - project: name: ceph-dashboard-cephadm-e2e-nightly ceph_branch: - - master + - main - quincy - pacific - octopus diff --git a/ceph-deploy-docs/config/definitions/ceph-deploy-docs.yml b/ceph-deploy-docs/config/definitions/ceph-deploy-docs.yml index ec6dc43a..0518b89b 100644 --- a/ceph-deploy-docs/config/definitions/ceph-deploy-docs.yml +++ b/ceph-deploy-docs/config/definitions/ceph-deploy-docs.yml @@ -24,7 +24,7 @@ - git: url: https://github.com/ceph/ceph-deploy branches: - - master + - main browser: auto skip-tag: true timeout: 20 diff --git a/ceph-deploy-tag/config/definitions/ceph-tag.yml b/ceph-deploy-tag/config/definitions/ceph-tag.yml index 0227b710..4414c360 100644 --- a/ceph-deploy-tag/config/definitions/ceph-tag.yml +++ b/ceph-deploy-tag/config/definitions/ceph-tag.yml @@ -9,7 +9,7 @@ wipe-workspace: true basedir: "ceph-build" branches: - - origin/master + - origin/main - job: name: ceph-deploy-tag @@ -31,7 +31,7 @@ - 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" diff --git a/ceph-deploy/config/definitions/ceph-deploy.yml b/ceph-deploy/config/definitions/ceph-deploy.yml index 05e89e67..019901d6 100644 --- a/ceph-deploy/config/definitions/ceph-deploy.yml +++ b/ceph-deploy/config/definitions/ceph-deploy.yml @@ -12,8 +12,8 @@ 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 diff --git a/ceph-dev-cron/config/definitions/ceph-dev-cron.yml b/ceph-dev-cron/config/definitions/ceph-dev-cron.yml index c7641624..94195644 100644 --- a/ceph-dev-cron/config/definitions/ceph-dev-cron.yml +++ b/ceph-dev-cron/config/definitions/ceph-dev-cron.yml @@ -29,7 +29,7 @@ url: https://github.com/ceph/ceph browser: auto branches: - - origin/master + - origin/main - origin/quincy - origin/pacific - origin/octopus @@ -108,12 +108,12 @@ 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: diff --git a/ceph-dev-new/config/definitions/ceph-dev-new.yml b/ceph-dev-new/config/definitions/ceph-dev-new.yml index 87f10cca..0700e9bd 100644 --- a/ceph-dev-new/config/definitions/ceph-dev-new.yml +++ b/ceph-dev-new/config/definitions/ceph-dev-new.yml @@ -21,7 +21,7 @@ - string: name: BRANCH description: "The git branch (or tag) to build" - default: master + default: main - string: name: DISTROS @@ -68,7 +68,7 @@ If this is checked, then the binaries will be built and pushed to chacra even if - string: name: CONTAINER_BRANCH description: "For CI_CONTAINER: Branch of ceph-container to use" - default: master + default: main - string: name: CONTAINER_REPO_HOSTNAME diff --git a/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml b/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml index 221f5cd5..61a928a3 100644 --- a/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml +++ b/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml @@ -25,7 +25,7 @@ url: https://github.com/ceph/ceph browser: auto branches: - - 'origin/master' + - 'origin/main' - 'origin/jewel' - 'origin/kraken' - 'origin/hammer' @@ -126,12 +126,12 @@ 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: diff --git a/ceph-dev/config/definitions/ceph-dev.yml b/ceph-dev/config/definitions/ceph-dev.yml index b246249c..628469b0 100644 --- a/ceph-dev/config/definitions/ceph-dev.yml +++ b/ceph-dev/config/definitions/ceph-dev.yml @@ -21,7 +21,7 @@ - string: name: BRANCH description: "The git branch (or tag) to build" - default: master + default: main - string: name: DISTROS @@ -67,7 +67,7 @@ If this is checked, then the binaries will be built and pushed to chacra even if - string: name: CONTAINER_BRANCH description: "For CI_CONTAINER: Branch of ceph-container to use" - default: master + default: main - string: name: CONTAINER_REPO_HOSTNAME diff --git a/ceph-docs/config/definitions/ceph-docs.yml b/ceph-docs/config/definitions/ceph-docs.yml index 945386c8..1c7716ac 100644 --- a/ceph-docs/config/definitions/ceph-docs.yml +++ b/ceph-docs/config/definitions/ceph-docs.yml @@ -26,7 +26,7 @@ # 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 diff --git a/ceph-grafana-trigger/config/definitions/ceph-grafana-trigger.yml b/ceph-grafana-trigger/config/definitions/ceph-grafana-trigger.yml index 2d6757a3..d63b919e 100644 --- a/ceph-grafana-trigger/config/definitions/ceph-grafana-trigger.yml +++ b/ceph-grafana-trigger/config/definitions/ceph-grafana-trigger.yml @@ -19,7 +19,7 @@ - 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" diff --git a/ceph-grafana/config/definitions/ceph-grafana.yml b/ceph-grafana/config/definitions/ceph-grafana.yml index e322a530..fd66d6c7 100644 --- a/ceph-grafana/config/definitions/ceph-grafana.yml +++ b/ceph-grafana/config/definitions/ceph-grafana.yml @@ -26,7 +26,7 @@ - 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" diff --git a/ceph-iscsi-cli-trigger/config/definitions/ceph-iscsi-cli-trigger.yml b/ceph-iscsi-cli-trigger/config/definitions/ceph-iscsi-cli-trigger.yml index 17181321..b9cd8100 100644 --- a/ceph-iscsi-cli-trigger/config/definitions/ceph-iscsi-cli-trigger.yml +++ b/ceph-iscsi-cli-trigger/config/definitions/ceph-iscsi-cli-trigger.yml @@ -23,7 +23,7 @@ - git: url: https://github.com/ceph/ceph-iscsi-cli.git branches: - - 'origin/master*' + - 'origin/main*' - 'origin/wip*' skip-tag: true timeout: 20 diff --git a/ceph-iscsi-cli/config/definitions/ceph-iscsi-cli.yml b/ceph-iscsi-cli/config/definitions/ceph-iscsi-cli.yml index a52bfbf8..45360840 100644 --- a/ceph-iscsi-cli/config/definitions/ceph-iscsi-cli.yml +++ b/ceph-iscsi-cli/config/definitions/ceph-iscsi-cli.yml @@ -10,7 +10,7 @@ - string: name: BRANCH description: "The git branch (or tag) to build" - default: "master" + default: "main" - string: name: DISTROS diff --git a/ceph-iscsi-config-trigger/config/definitions/ceph-iscsi-config-trigger.yml b/ceph-iscsi-config-trigger/config/definitions/ceph-iscsi-config-trigger.yml index 23274c0e..fd5c9a5f 100644 --- a/ceph-iscsi-config-trigger/config/definitions/ceph-iscsi-config-trigger.yml +++ b/ceph-iscsi-config-trigger/config/definitions/ceph-iscsi-config-trigger.yml @@ -23,7 +23,7 @@ - git: url: https://github.com/ceph/ceph-iscsi-config.git branches: - - 'origin/master*' + - 'origin/main*' - 'origin/wip*' skip-tag: true timeout: 20 diff --git a/ceph-iscsi-config/config/definitions/ceph-iscsi-config.yml b/ceph-iscsi-config/config/definitions/ceph-iscsi-config.yml index c7b0f505..5d257207 100644 --- a/ceph-iscsi-config/config/definitions/ceph-iscsi-config.yml +++ b/ceph-iscsi-config/config/definitions/ceph-iscsi-config.yml @@ -10,7 +10,7 @@ - string: name: BRANCH description: "The git branch (or tag) to build" - default: "master" + default: "main" - string: name: DISTROS diff --git a/ceph-iscsi-tools-trigger/config/definitions/ceph-iscsi-tools-trigger.yml b/ceph-iscsi-tools-trigger/config/definitions/ceph-iscsi-tools-trigger.yml index bd9ba096..904dfa99 100644 --- a/ceph-iscsi-tools-trigger/config/definitions/ceph-iscsi-tools-trigger.yml +++ b/ceph-iscsi-tools-trigger/config/definitions/ceph-iscsi-tools-trigger.yml @@ -23,7 +23,7 @@ - git: url: https://github.com/ceph/ceph-iscsi-tools.git branches: - - 'origin/master*' + - 'origin/main*' - 'origin/wip*' skip-tag: true timeout: 20 diff --git a/ceph-iscsi-tools/config/definitions/ceph-iscsi-tools.yml b/ceph-iscsi-tools/config/definitions/ceph-iscsi-tools.yml index dea44c53..55808030 100644 --- a/ceph-iscsi-tools/config/definitions/ceph-iscsi-tools.yml +++ b/ceph-iscsi-tools/config/definitions/ceph-iscsi-tools.yml @@ -10,7 +10,7 @@ - string: name: BRANCH description: "The git branch (or tag) to build" - default: "master" + default: "main" - string: name: DISTROS diff --git a/ceph-iscsi-trigger/config/definitions/ceph-iscsi-trigger.yml b/ceph-iscsi-trigger/config/definitions/ceph-iscsi-trigger.yml index b34c4296..75fd374c 100644 --- a/ceph-iscsi-trigger/config/definitions/ceph-iscsi-trigger.yml +++ b/ceph-iscsi-trigger/config/definitions/ceph-iscsi-trigger.yml @@ -23,7 +23,7 @@ - git: url: https://github.com/ceph/ceph-iscsi.git branches: - - 'origin/master*' + - 'origin/main*' - 'origin/wip*' skip-tag: true timeout: 20 diff --git a/ceph-iscsi/config/definitions/ceph-iscsi.yml b/ceph-iscsi/config/definitions/ceph-iscsi.yml index ca73d757..51e9e4bc 100644 --- a/ceph-iscsi/config/definitions/ceph-iscsi.yml +++ b/ceph-iscsi/config/definitions/ceph-iscsi.yml @@ -10,7 +10,7 @@ - string: name: BRANCH description: "The git branch (or tag) to build" - default: "master" + default: "main" - string: name: DISTROS diff --git a/ceph-medic-docs/config/definitions/ceph-medic-docs.yml b/ceph-medic-docs/config/definitions/ceph-medic-docs.yml index 01d7b752..6401e934 100644 --- a/ceph-medic-docs/config/definitions/ceph-medic-docs.yml +++ b/ceph-medic-docs/config/definitions/ceph-medic-docs.yml @@ -24,7 +24,7 @@ - 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 diff --git a/ceph-medic-release/config/definitions/ceph-medic-release.yml b/ceph-medic-release/config/definitions/ceph-medic-release.yml index 9daad442..3dea2239 100644 --- a/ceph-medic-release/config/definitions/ceph-medic-release.yml +++ b/ceph-medic-release/config/definitions/ceph-medic-release.yml @@ -13,7 +13,7 @@ - string: name: BRANCH description: "The git branch (or tag) to build" - default: "master" + default: "main" - string: name: DISTROS diff --git a/ceph-medic-tests/config/definitions/ceph-medic-tests.yml b/ceph-medic-tests/config/definitions/ceph-medic-tests.yml index e2e7d14c..911e0671 100644 --- a/ceph-medic-tests/config/definitions/ceph-medic-tests.yml +++ b/ceph-medic-tests/config/definitions/ceph-medic-tests.yml @@ -1,6 +1,6 @@ - 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: @@ -32,12 +32,12 @@ - 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' diff --git a/ceph-perf-pull-requests/config/definitions/ceph-perf-pull-requests.yml b/ceph-perf-pull-requests/config/definitions/ceph-perf-pull-requests.yml index 8706c0ba..184a2ac4 100644 --- a/ceph-perf-pull-requests/config/definitions/ceph-perf-pull-requests.yml +++ b/ceph-perf-pull-requests/config/definitions/ceph-perf-pull-requests.yml @@ -1,15 +1,15 @@ # 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 @@ -31,12 +31,12 @@ 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" @@ -81,14 +81,14 @@ 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} \ @@ -156,7 +156,7 @@ cancel-builds-on-update: true scm: - - ceph-master + - ceph-main - ceph-pr - cbt @@ -177,7 +177,7 @@ # 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}} ;; @@ -207,7 +207,7 @@ --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" @@ -217,8 +217,8 @@ # 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}' diff --git a/ceph-pr-api/config/definitions/ceph-pr-api.yml b/ceph-pr-api/config/definitions/ceph-pr-api.yml index 49bc91c4..df4a6d3b 100644 --- a/ceph-pr-api/config/definitions/ceph-pr-api.yml +++ b/ceph-pr-api/config/definitions/ceph-pr-api.yml @@ -35,7 +35,7 @@ org-list: - ceph white-list-target-branches: - - master + - main - quincy - pacific - octopus diff --git a/ceph-pr-commits/build/test_commits.py b/ceph-pr-commits/build/test_commits.py index 8d002d08..4162ec7a 100644 --- a/ceph-pr-commits/build/test_commits.py +++ b/ceph-pr-commits/build/test_commits.py @@ -16,7 +16,7 @@ class TestCommits(object): """ 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( @@ -32,7 +32,7 @@ class TestCommits(object): @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)) @@ -49,7 +49,7 @@ class TestCommits(object): 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 )) @@ -67,7 +67,7 @@ class TestCommits(object): 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 )) diff --git a/ceph-pr-commits/config/definitions/ceph-pr-commits.yml b/ceph-pr-commits/config/definitions/ceph-pr-commits.yml index 8ef3f204..a5e65fb5 100644 --- a/ceph-pr-commits/config/definitions/ceph-pr-commits.yml +++ b/ceph-pr-commits/config/definitions/ceph-pr-commits.yml @@ -18,7 +18,7 @@ - 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 diff --git a/ceph-pull-requests-arm64/config/definitions/ceph-pull-requests-arm64.yml b/ceph-pull-requests-arm64/config/definitions/ceph-pull-requests-arm64.yml index 55f5e754..6ae72b5f 100644 --- a/ceph-pull-requests-arm64/config/definitions/ceph-pull-requests-arm64.yml +++ b/ceph-pull-requests-arm64/config/definitions/ceph-pull-requests-arm64.yml @@ -14,7 +14,7 @@ - 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: @@ -67,7 +67,7 @@ success-status: "make check succeeded" failure-status: "make check failed" white-list-target-branches: - - master + - main wrappers: - credentials-binding: - username-password-separated: diff --git a/ceph-tag/config/definitions/ceph-tag.yml b/ceph-tag/config/definitions/ceph-tag.yml index 3b0c28d4..26f76bb0 100644 --- a/ceph-tag/config/definitions/ceph-tag.yml +++ b/ceph-tag/config/definitions/ceph-tag.yml @@ -57,7 +57,7 @@ SECURITY: Builds from BRANCH-release branch in ceph-private.git (private repo)." wipe-workspace: true basedir: "ceph-build" branches: - - origin/master + - origin/main builders: diff --git a/ceph-volume-ansible-prs/build/build b/ceph-volume-ansible-prs/build/build index 7a61adc4..f1b578a4 100644 --- a/ceph-volume-ansible-prs/build/build +++ b/ceph-volume-ansible-prs/build/build @@ -35,7 +35,7 @@ elif [[ "$ghprbTargetBranch" == "octopus" ]]; then elif [[ "$ghprbTargetBranch" == "pacific" ]]; then CEPH_ANSIBLE_BRANCH="stable-6.0" else - CEPH_ANSIBLE_BRANCH="master" + CEPH_ANSIBLE_BRANCH="main" fi if [[ "$ghprbTargetBranch" == "nautilus" ]]; then diff --git a/ceph-volume-ansible-prs/config/definitions/ceph-volume-pr.yml b/ceph-volume-ansible-prs/config/definitions/ceph-volume-pr.yml index 11af3c45..1bcae8f0 100644 --- a/ceph-volume-ansible-prs/config/definitions/ceph-volume-pr.yml +++ b/ceph-volume-ansible-prs/config/definitions/ceph-volume-pr.yml @@ -78,7 +78,7 @@ 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)" diff --git a/ceph-volume-nightly/build/build b/ceph-volume-nightly/build/build index b912c5ca..a8762f25 100644 --- a/ceph-volume-nightly/build/build +++ b/ceph-volume-nightly/build/build @@ -19,7 +19,7 @@ cd src/ceph-volume/ceph_volume/tests/functional/$SUBCOMMAND if [ "$CEPH_BRANCH" = "nautilus" ]; then CEPH_ANSIBLE_BRANCH="stable-4.0" else - CEPH_ANSIBLE_BRANCH="master" + 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 ed06bc0f..17d83057 100644 --- a/ceph-volume-nightly/config/definitions/ceph-volume-nightly.yml +++ b/ceph-volume-nightly/config/definitions/ceph-volume-nightly.yml @@ -13,14 +13,14 @@ 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 @@ -43,14 +43,14 @@ 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 @@ -74,14 +74,14 @@ 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 diff --git a/ceph-volume-pr/config/definitions/ceph-volume-pr.yml b/ceph-volume-pr/config/definitions/ceph-volume-pr.yml index 5f6eddc9..415f43cf 100644 --- a/ceph-volume-pr/config/definitions/ceph-volume-pr.yml +++ b/ceph-volume-pr/config/definitions/ceph-volume-pr.yml @@ -26,7 +26,7 @@ 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)" diff --git a/ceph-volume-scenario/config/definitions/ceph-volume-scenario.yml b/ceph-volume-scenario/config/definitions/ceph-volume-scenario.yml index fbe9c6c6..8c7afa14 100644 --- a/ceph-volume-scenario/config/definitions/ceph-volume-scenario.yml +++ b/ceph-volume-scenario/config/definitions/ceph-volume-scenario.yml @@ -27,7 +27,7 @@ - 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" @@ -35,7 +35,7 @@ - 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" diff --git a/ceph-volume-test/config/definitions/ceph-volume-test.yml b/ceph-volume-test/config/definitions/ceph-volume-test.yml index 4731b3fd..56371d98 100644 --- a/ceph-volume-test/config/definitions/ceph-volume-test.yml +++ b/ceph-volume-test/config/definitions/ceph-volume-test.yml @@ -18,7 +18,7 @@ - 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" @@ -26,20 +26,20 @@ - 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 diff --git a/ceph-windows-image-build/build/setup.ps1 b/ceph-windows-image-build/build/setup.ps1 index 08ae6736..b5c9ccac 100644 --- a/ceph-windows-image-build/build/setup.ps1 +++ b/ceph-windows-image-build/build/setup.ps1 @@ -8,7 +8,7 @@ $WDK_URL = "https://download.microsoft.com/download/7/d/6/7d602355-8ae9-414c-ae3 $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 { diff --git a/ceph-windows-image-build/config/definitions/ceph-windows-image-build.yml b/ceph-windows-image-build/config/definitions/ceph-windows-image-build.yml index a90849f1..10863ab3 100644 --- a/ceph-windows-image-build/config/definitions/ceph-windows-image-build.yml +++ b/ceph-windows-image-build/config/definitions/ceph-windows-image-build.yml @@ -28,7 +28,7 @@ - git: url: https://github.com/ceph/ceph-build.git branches: - - master + - main basedir: ceph-build builders: diff --git a/ceph-windows-installer-build/build/setup b/ceph-windows-installer-build/build/setup index eec43afa..bd670806 100644 --- a/ceph-windows-installer-build/build/setup +++ b/ceph-windows-installer-build/build/setup @@ -2,12 +2,12 @@ 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" diff --git a/ceph-windows-installer-build/config/definitions/ceph-windows-installer-build.yml b/ceph-windows-installer-build/config/definitions/ceph-windows-installer-build.yml index d0e7660b..b5efaa29 100644 --- a/ceph-windows-installer-build/config/definitions/ceph-windows-installer-build.yml +++ b/ceph-windows-installer-build/config/definitions/ceph-windows-installer-build.yml @@ -17,12 +17,12 @@ - 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 @@ -32,7 +32,7 @@ - string: name: WNBD_BRANCH description: "The branch name for the WNBD build." - default: master + default: main - string: name: WNBD_SHA1 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 cb03a90f..3601f89d 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 @@ -35,7 +35,7 @@ org-list: - ceph white-list-target-branches: - - master + - main - quincy trigger-phrase: 'jenkins test windows' skip-build-phrase: '^jenkins do not test.*' diff --git a/ceph-windows-test/build/get_chacra_build b/ceph-windows-test/build/get_chacra_build index 217d7b66..16043922 100644 --- a/ceph-windows-test/build/get_chacra_build +++ b/ceph-windows-test/build/get_chacra_build @@ -3,10 +3,10 @@ set -o errexit 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 diff --git a/ceph-windows-test/config/definitions/ceph-windows-test.yml b/ceph-windows-test/config/definitions/ceph-windows-test.yml index 0733a51f..c45ca997 100644 --- a/ceph-windows-test/config/definitions/ceph-windows-test.yml +++ b/ceph-windows-test/config/definitions/ceph-windows-test.yml @@ -21,7 +21,7 @@ - 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." diff --git a/ceph/config/definitions/ceph.yml b/ceph/config/definitions/ceph.yml index fdc1155c..9dfd5558 100644 --- a/ceph/config/definitions/ceph.yml +++ b/ceph/config/definitions/ceph.yml @@ -19,8 +19,8 @@ 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 diff --git a/cephmetrics-release/config/definitions/cephmetrics-release.yml b/cephmetrics-release/config/definitions/cephmetrics-release.yml index d9256e67..feaa982f 100644 --- a/cephmetrics-release/config/definitions/cephmetrics-release.yml +++ b/cephmetrics-release/config/definitions/cephmetrics-release.yml @@ -13,7 +13,7 @@ - string: name: BRANCH description: "The git branch (or tag) to build" - default: "master" + default: "main" - string: name: DISTROS diff --git a/cephmetrics/config/definitions/cephmetrics.yml b/cephmetrics/config/definitions/cephmetrics.yml index a3fa54e1..16c8e20e 100644 --- a/cephmetrics/config/definitions/cephmetrics.yml +++ b/cephmetrics/config/definitions/cephmetrics.yml @@ -13,7 +13,7 @@ - string: name: BRANCH description: "The git branch (or tag) to build" - default: "master" + default: "main" - string: name: DISTROS diff --git a/chacra-pull-requests/config/definitions/chacra-pull-requests.yml b/chacra-pull-requests/config/definitions/chacra-pull-requests.yml index 02664fd6..983a80cd 100644 --- a/chacra-pull-requests/config/definitions/chacra-pull-requests.yml +++ b/chacra-pull-requests/config/definitions/chacra-pull-requests.yml @@ -23,7 +23,7 @@ wipe-workspace: false basedir: "ceph-build" branches: - - origin/master + - origin/main - job: diff --git a/configshell-fb/config/definitions/configshell-fb.yml b/configshell-fb/config/definitions/configshell-fb.yml index f74ad033..98ad20e3 100644 --- a/configshell-fb/config/definitions/configshell-fb.yml +++ b/configshell-fb/config/definitions/configshell-fb.yml @@ -10,7 +10,7 @@ - string: name: BRANCH description: "The git branch (or tag) to build" - default: "master" + default: main - string: name: DISTROS diff --git a/diamond/config/definitions/diamond.yml b/diamond/config/definitions/diamond.yml index 0d0a9911..7f3b3ce5 100644 --- a/diamond/config/definitions/diamond.yml +++ b/diamond/config/definitions/diamond.yml @@ -20,7 +20,7 @@ - string: name: BRANCH description: "The git branch (or tag) to build" - default: master + default: main - string: name: DISTROS diff --git a/kernel-trigger/config/definitions/kernel-trigger.yml b/kernel-trigger/config/definitions/kernel-trigger.yml index b9b6b04e..c3791b2a 100644 --- a/kernel-trigger/config/definitions/kernel-trigger.yml +++ b/kernel-trigger/config/definitions/kernel-trigger.yml @@ -36,7 +36,7 @@ origin/testing - origin/master + origin/main origin/for-linus diff --git a/nfs-ganesha/config/definitions/nfs-ganesha.yml b/nfs-ganesha/config/definitions/nfs-ganesha.yml index 9926b99f..8beaa295 100644 --- a/nfs-ganesha/config/definitions/nfs-ganesha.yml +++ b/nfs-ganesha/config/definitions/nfs-ganesha.yml @@ -48,7 +48,7 @@ - string: name: CEPH_BRANCH description: "The branch of Ceph to get the repo file of for libcephfs" - default: "master" + default: main - string: name: DISTROS diff --git a/quay-pruner/config/definitions/quay-pruner.yml b/quay-pruner/config/definitions/quay-pruner.yml index cf982291..a3244659 100644 --- a/quay-pruner/config/definitions/quay-pruner.yml +++ b/quay-pruner/config/definitions/quay-pruner.yml @@ -4,7 +4,7 @@ - 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" diff --git a/radosgw-agent/config/definitions/radosgw-agent.yml b/radosgw-agent/config/definitions/radosgw-agent.yml index a6a1ff56..49278c79 100644 --- a/radosgw-agent/config/definitions/radosgw-agent.yml +++ b/radosgw-agent/config/definitions/radosgw-agent.yml @@ -14,7 +14,7 @@ - string: name: BRANCH description: "The git branch or tag to build" - default: master + default: main - bool: name: RELEASE diff --git a/rtslib-fb-trigger/config/definitions/rtslib-fb-trigger.yml b/rtslib-fb-trigger/config/definitions/rtslib-fb-trigger.yml index 13bef3c2..b8151283 100644 --- a/rtslib-fb-trigger/config/definitions/rtslib-fb-trigger.yml +++ b/rtslib-fb-trigger/config/definitions/rtslib-fb-trigger.yml @@ -23,7 +23,7 @@ - git: url: https://github.com/ceph/rtslib-fb.git branches: - - 'origin/master*' + - 'origin/main*' - 'origin/testing*' - 'origin/wip*' skip-tag: true diff --git a/rtslib-fb/config/definitions/rtslib-fb.yml b/rtslib-fb/config/definitions/rtslib-fb.yml index 82a4d675..42430ef9 100644 --- a/rtslib-fb/config/definitions/rtslib-fb.yml +++ b/rtslib-fb/config/definitions/rtslib-fb.yml @@ -10,7 +10,7 @@ - string: name: BRANCH description: "The git branch (or tag) to build" - default: "master" + default: main - string: name: DISTROS diff --git a/samba-trigger/config/definitions/samba-trigger.yml b/samba-trigger/config/definitions/samba-trigger.yml index 1e34674b..f71c6e49 100644 --- a/samba-trigger/config/definitions/samba-trigger.yml +++ b/samba-trigger/config/definitions/samba-trigger.yml @@ -24,7 +24,7 @@ url: https://github.com/ceph/samba.git branches: - 'origin/ceph*' - - 'origin/master*' + - 'origin/main*' - 'origin/wip-*' skip-tag: true timeout: 20 diff --git a/samba/config/definitions/samba.yml b/samba/config/definitions/samba.yml index 7ff78300..b7ee7804 100644 --- a/samba/config/definitions/samba.yml +++ b/samba/config/definitions/samba.yml @@ -10,7 +10,7 @@ - string: name: SAMBA_BRANCH description: "The git branch (or tag) to build" - default: "master" + default: main - string: name: CEPH_SHA1 @@ -20,7 +20,7 @@ - string: name: CEPH_BRANCH description: "The branch of Ceph to get the repo file of for libcephfs" - default: "master" + default: main - string: name: DISTROS diff --git a/scripts/build_utils.sh b/scripts/build_utils.sh index 37944c85..c2acb2a8 100644 --- a/scripts/build_utils.sh +++ b/scripts/build_utils.sh @@ -1137,7 +1137,7 @@ start_tox() { 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 diff --git a/scripts/dashboard/install-cephadm-e2e-deps.sh b/scripts/dashboard/install-cephadm-e2e-deps.sh index 0764b681..e5fe7874 100644 --- a/scripts/dashboard/install-cephadm-e2e-deps.sh +++ b/scripts/dashboard/install-cephadm-e2e-deps.sh @@ -84,7 +84,7 @@ docker run --net host --security-opt label=disable \ " | 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 diff --git a/sepia-fog-images/README.rst b/sepia-fog-images/README.rst index 1e512879..105b3905 100644 --- a/sepia-fog-images/README.rst +++ b/sepia-fog-images/README.rst @@ -56,10 +56,10 @@ Usage 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 diff --git a/sepia-fog-images/build/build b/sepia-fog-images/build/build index c2b3bc00..d6304792 100755 --- a/sepia-fog-images/build/build +++ b/sepia-fog-images/build/build @@ -57,7 +57,7 @@ if [ ! -d teuthology ]; then git checkout $TEUTHOLOGYBRANCH else cd teuthology - git checkout master + git checkout main git pull git checkout $TEUTHOLOGYBRANCH fi @@ -89,7 +89,7 @@ if [ ! -d ceph-cm-ansible ]; then git checkout $CMANSIBLEBRANCH else cd ceph-cm-ansible - git checkout master + git checkout main git pull git checkout $CMANSIBLEBRANCH fi diff --git a/sepia-fog-images/config/definitions/sepia-fog-images.yml b/sepia-fog-images/config/definitions/sepia-fog-images.yml index 72eb39c5..f5f63d84 100644 --- a/sepia-fog-images/config/definitions/sepia-fog-images.yml +++ b/sepia-fog-images/config/definitions/sepia-fog-images.yml @@ -30,11 +30,11 @@ 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 diff --git a/shaman-pull-requests/config/definitions/shaman-pull-requests.yml b/shaman-pull-requests/config/definitions/shaman-pull-requests.yml index f416595d..3677c322 100644 --- a/shaman-pull-requests/config/definitions/shaman-pull-requests.yml +++ b/shaman-pull-requests/config/definitions/shaman-pull-requests.yml @@ -23,7 +23,7 @@ wipe-workspace: false basedir: "ceph-build" branches: - - origin/master + - origin/main - job: diff --git a/tcmu-runner-trigger/config/definitions/tcmu-runner-trigger.yml b/tcmu-runner-trigger/config/definitions/tcmu-runner-trigger.yml index e10a1993..a566567b 100644 --- a/tcmu-runner-trigger/config/definitions/tcmu-runner-trigger.yml +++ b/tcmu-runner-trigger/config/definitions/tcmu-runner-trigger.yml @@ -23,7 +23,7 @@ - git: url: https://github.com/ceph/tcmu-runner.git branches: - - 'origin/master*' + - 'origin/main*' - 'origin/testing*' - 'origin/wip*' skip-tag: true diff --git a/tcmu-runner/config/definitions/tcmu-runner.yml b/tcmu-runner/config/definitions/tcmu-runner.yml index 72893678..98e5c024 100644 --- a/tcmu-runner/config/definitions/tcmu-runner.yml +++ b/tcmu-runner/config/definitions/tcmu-runner.yml @@ -10,7 +10,7 @@ - string: name: BRANCH description: "The git branch (or tag) to build" - default: "master" + default: main - string: name: CEPH_SHA1 @@ -20,7 +20,7 @@ - string: name: CEPH_BRANCH description: "The branch of Ceph to get the repo file of for libcephfs" - default: "master" + default: main - string: name: DISTROS diff --git a/teuthology-docs/config/definitions/teuthology-docs.yml b/teuthology-docs/config/definitions/teuthology-docs.yml index d7a137a7..b6d7f744 100644 --- a/teuthology-docs/config/definitions/teuthology-docs.yml +++ b/teuthology-docs/config/definitions/teuthology-docs.yml @@ -25,7 +25,7 @@ - git: url: https://github.com/ceph/teuthology.git branches: - - master + - main browser: auto timeout: 20 diff --git a/wnbd-build/config/definitions/wnbd-build.yml b/wnbd-build/config/definitions/wnbd-build.yml index 4cc90eb1..9e3f8f55 100644 --- a/wnbd-build/config/definitions/wnbd-build.yml +++ b/wnbd-build/config/definitions/wnbd-build.yml @@ -17,7 +17,7 @@ - string: name: BRANCH description: "The git branch (or tag) to build" - default: "master" + default: main - bool: name: THROWAWAY -- 2.39.5