From 0ce39416e8dcd8d5b1093492df4b7e275fc3abc1 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Wed, 3 Aug 2022 07:43:35 +0200 Subject: [PATCH] replace 'master' references with 'main' Because the branch'master' was renamed 'main' Signed-off-by: Guillaume Abrioux --- group_vars/all.yml.sample | 2 +- group_vars/rhcs.yml.sample | 2 +- roles/ceph-defaults/defaults/main.yml | 2 +- tox-subset_update.ini | 4 ---- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample index 8138ad731..f20fb85b9 100644 --- a/group_vars/all.yml.sample +++ b/group_vars/all.yml.sample @@ -207,7 +207,7 @@ dummy: # # Enabled when ceph_repository == 'dev' # -#ceph_dev_branch: main # development branch you would like to use e.g: master, wip-hack +#ceph_dev_branch: main # development branch you would like to use e.g: main, wip-hack #ceph_dev_sha1: latest # distinct sha1 to use, defaults to 'latest' (as in latest built) #nfs_ganesha_dev: false # use development repos for nfs-ganesha diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample index 89a6a42d8..39cbe5a51 100644 --- a/group_vars/rhcs.yml.sample +++ b/group_vars/rhcs.yml.sample @@ -207,7 +207,7 @@ ceph_rhcs_version: 5 # # Enabled when ceph_repository == 'dev' # -#ceph_dev_branch: main # development branch you would like to use e.g: master, wip-hack +#ceph_dev_branch: main # development branch you would like to use e.g: main, wip-hack #ceph_dev_sha1: latest # distinct sha1 to use, defaults to 'latest' (as in latest built) #nfs_ganesha_dev: false # use development repos for nfs-ganesha diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml index 182fdfb13..1fe0d4019 100644 --- a/roles/ceph-defaults/defaults/main.yml +++ b/roles/ceph-defaults/defaults/main.yml @@ -199,7 +199,7 @@ ceph_obs_repo: "https://download.opensuse.org/repositories/filesystems:/ceph:/{{ # # Enabled when ceph_repository == 'dev' # -ceph_dev_branch: main # development branch you would like to use e.g: master, wip-hack +ceph_dev_branch: main # development branch you would like to use e.g: main, wip-hack ceph_dev_sha1: latest # distinct sha1 to use, defaults to 'latest' (as in latest built) nfs_ganesha_dev: false # use development repos for nfs-ganesha diff --git a/tox-subset_update.ini b/tox-subset_update.ini index cafbb8444..975bc08d3 100644 --- a/tox-subset_update.ini +++ b/tox-subset_update.ini @@ -29,8 +29,6 @@ setenv= non_container: PLAYBOOK = site.yml.sample UPDATE_CEPH_DOCKER_IMAGE_TAG = latest-pacific - UPDATE_CEPH_DEV_BRANCH = master - UPDATE_CEPH_DEV_SHA1 = latest ROLLING_UPDATE = True changedir={toxinidir}/tests/functional/subset_update{env:CONTAINER_DIR:} commands= @@ -61,8 +59,6 @@ commands= # mon1 ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/rolling_update.yml --limit mon1 --tags=mons --extra-vars "\ ireallymeanit=yes \ - ceph_dev_branch={env:UPDATE_CEPH_DEV_BRANCH:master} \ - ceph_dev_sha1={env:UPDATE_CEPH_DEV_SHA1:latest} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \