#9749 Update container base sync to point rawhide to f34
Merged 2 months ago by humaton. Opened 2 months ago by humaton.
humaton/releng containers_branching  into  master

@@ -404,6 +404,7 @@ 

  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 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 @@ 

  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 @@ 

      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

+ <https://pagure.io/releng/blob/master/f/scripts/sync-latest-container-base-image.sh#_38>`_.

+ 

+ And set current_rawhide variable.

  

  Consider Before Running

  =======================

@@ -35,7 +35,7 @@ 

  # 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] ]];

Update branching SOP to include sync script update

Signed-off-by: Tomas Hrcka thrcka@redhat.com

Pull-Request has been merged by humaton

2 months ago