From ba8dd031efe21c5966cf96e77050f09737aa05b0 Mon Sep 17 00:00:00 2001 From: David Galloway Date: Wed, 25 May 2022 11:18:58 -0400 Subject: [PATCH] Replace remaining references to master Signed-off-by: David Galloway --- .../config/definitions/ceph-dev-container-only.yml | 4 ++-- ceph-setup/config/definitions/ceph-setup.yml | 2 +- ceph-tag/config/definitions/ceph-tag.yml | 2 +- jenkins-job-builder/build/build | 8 ++++---- jenkins-job-builder/config/definitions/jjb.yml | 4 ++-- mita-deploy/config/definitions/mita-deploy.yml | 6 +++--- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ceph-dev-container-only/config/definitions/ceph-dev-container-only.yml b/ceph-dev-container-only/config/definitions/ceph-dev-container-only.yml index 596e58f4..df50de79 100644 --- a/ceph-dev-container-only/config/definitions/ceph-dev-container-only.yml +++ b/ceph-dev-container-only/config/definitions/ceph-dev-container-only.yml @@ -59,7 +59,7 @@ - string: name: BRANCH description: "The git branch (or tag) to build. NOTE: This branch must already be built and packages pushed to a chacra node!" - default: master + default: main - string: name: SHA1 @@ -88,7 +88,7 @@ - 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-setup/config/definitions/ceph-setup.yml b/ceph-setup/config/definitions/ceph-setup.yml index c3e9281f..82d96a11 100644 --- a/ceph-setup/config/definitions/ceph-setup.yml +++ b/ceph-setup/config/definitions/ceph-setup.yml @@ -32,7 +32,7 @@ wipe-workspace: true basedir: "ceph-build" branches: - - origin/master + - origin/main builders: - shell: diff --git a/ceph-tag/config/definitions/ceph-tag.yml b/ceph-tag/config/definitions/ceph-tag.yml index 26f76bb0..79d2fdb1 100644 --- a/ceph-tag/config/definitions/ceph-tag.yml +++ b/ceph-tag/config/definitions/ceph-tag.yml @@ -18,7 +18,7 @@ - string: name: BRANCH description: "The git BRANCH to build (e.g., pacific)" - default: master + default: main - bool: name: TAG diff --git a/jenkins-job-builder/build/build b/jenkins-job-builder/build/build index 3f293b94..d4ddd901 100644 --- a/jenkins-job-builder/build/build +++ b/jenkins-job-builder/build/build @@ -17,7 +17,7 @@ install_python_packages $TEMPVENV "pkgs[@]" latest # Wipe out JJB's cache if $FORCE is set. [ "$FORCE" = true ] && rm -rf "$HOME/.cache/jenkins_jobs/" -# Each jenkins master will write its own config file when the +# Each jenkins controller will write its own config file when the # jenkins-job-builder gets run JENKINS_FQDN=$(echo $JENKINS_URL | awk -F/ '{print $3}') JJB_CONFIG="$HOME/.jenkins_jobs.$JENKINS_FQDN.ini" @@ -50,7 +50,7 @@ for dir in `find . -maxdepth 1 -path ./.git -prune -o -type d -print`; do JJB_CONFIG="$HOME/.jenkins_jobs.jenkins.ceph.com.ini" fi - # Each jenkins-job-builder job should only update the master + # Each jenkins-job-builder job should only update the controller # that started it. This prevents collisions. if [[ "$JJB_CONFIG" == "$HOME/.jenkins_jobs.$JENKINS_FQDN.ini" ]]; then # Test the definitions first @@ -64,10 +64,10 @@ for dir in `find . -maxdepth 1 -path ./.git -prune -o -type d -print`; do fi done -# Set JJB_CONFIG back to the one our master wrote so the var can be used in the deletion task below +# Set JJB_CONFIG back to the one our controller wrote so the var can be used in the deletion task below JJB_CONFIG="$HOME/.jenkins_jobs.$JENKINS_FQDN.ini" -# Delete jobs our master has that didn't get job xml written during `jenkins-jobs test` +# Delete jobs our controller has that didn't get job xml written during `jenkins-jobs test` # jenkins-job-builder doesn't get a config written so we `grep -v it` so it doesn't get deleted. for JOB in $(curl -s https://$JENKINS_FQDN/api/json | jq -r '.jobs[].name' | grep -v jenkins-job-builder | sort); do if [ ! -f $TEMPDIR/$JOB ]; then diff --git a/jenkins-job-builder/config/definitions/jjb.yml b/jenkins-job-builder/config/definitions/jjb.yml index ae245d57..78ba6a66 100644 --- a/jenkins-job-builder/config/definitions/jjb.yml +++ b/jenkins-job-builder/config/definitions/jjb.yml @@ -20,7 +20,7 @@ description: " If this is unchecked, then JJB will use its cache to update jobs. This makes this JJB job run faster, but it could cause JJB to fail to update some Jenkins jobs if the jobs have been changed outside of this JJB job's workflow. (This is the default.) -If this is checked, JJB will wipe out its cache and force each job to align with the configurations in master." +If this is checked, JJB will wipe out its cache and force each job to align with the configurations in main." triggers: - github @@ -39,7 +39,7 @@ If this is checked, JJB will wipe out its cache and force each job to align with - git: url: https://github.com/ceph/ceph-build branches: - - master + - main browser: auto timeout: 20 diff --git a/mita-deploy/config/definitions/mita-deploy.yml b/mita-deploy/config/definitions/mita-deploy.yml index 01ddb1e4..5db71d24 100644 --- a/mita-deploy/config/definitions/mita-deploy.yml +++ b/mita-deploy/config/definitions/mita-deploy.yml @@ -4,7 +4,7 @@ - git: url: https://github.com/ceph/mita.git branches: - - master + - main browser: auto timeout: 20 skip-tag: true @@ -29,8 +29,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" scm: - mita -- 2.39.5