From 969b81d842ad11de9ef385b39485595c13907b9a Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Sep 10 2020 12:53:31 +0000 Subject: Update container base sync to point rawhide to f34 Update branching SOP to include sync script update Signed-off-by: Tomas Hrcka --- diff --git a/docs/source/sop_mass_branching.rst b/docs/source/sop_mass_branching.rst index 5e48b14..19694f0 100644 --- a/docs/source/sop_mass_branching.rst +++ b/docs/source/sop_mass_branching.rst @@ -404,6 +404,7 @@ Fedora Branched Set FedoraBranched variable to True in infra ansible repo :: + --- a/vars/all/FedoraBranched.yaml +++ b/vars/all/FedoraBranched.yaml @@ -1 +1 @@ @@ -413,12 +414,13 @@ Set FedoraBranched variable to True in infra ansible repo Set FedoraBranchedBodhi variable to prebeta in infra ansible repo :: + --- a/vars/all/FedoraBranchedBodhi.yaml +++ b/vars/all/FedoraBranchedBodhi.yaml @@ -1,2 +1,2 @@ #options are: prebeta, postbeta, current - -FedoraBranchedBodhi: current - +FedoraBranchedBodhi: prebeta + - FedoraBranchedBodhi: current + + FedoraBranchedBodhi: prebeta Koji hub ^^^^^^^^ @@ -426,12 +428,13 @@ Koji hub Update the koji hub config to allow side tags for new koji rawhide tag :: + --- a/roles/koji_hub/templates/hub.conf.j2 +++ b/roles/koji_hub/templates/hub.conf.j2 @@ +1 @@ - +tag f34-build :: allow - tag f33-build :: allow - tag f32-build :: allow + + tag f34-build :: allow + tag f33-build :: allow + tag f32-build :: allow Robosignatory ^^^^^^^^^^^^^ @@ -1048,6 +1051,13 @@ On ``compose-x86-01.phx2`` run: Untagged: fedora-docker-base-rawhide-20170310.n.0.x86_64:latest $ for i in $(sudo docker images -q -f 'dangling=true'); do sudo docker rmi $i; done +Update sync script +^^^^^^^^^^^^^^^^^^ + +In releng repository update `script +`_. + +And set current_rawhide variable. Consider Before Running ======================= diff --git a/scripts/sync-latest-container-base-image.sh b/scripts/sync-latest-container-base-image.sh index e25d86a..af8602b 100755 --- a/scripts/sync-latest-container-base-image.sh +++ b/scripts/sync-latest-container-base-image.sh @@ -35,7 +35,7 @@ ARCHES=("aarch64" "armhfp" "ppc64le" "s390x" "x86_64") # need to move the fedora:latest tag current_stable="32" # Define what is rawhide so we know to push that tag -current_rawhide="33" +current_rawhide="34" # Sanity checking # FIXME - Have to update this regex every time we drop a new Fedora Release if ! [[ "${1}" =~ [24|25|26|27|28|29|30|31] ]];