From 75fd18aa8bf894166b4041e519bfacaded6a9f08 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 14 Feb 2018 17:34:43 +0000 Subject: [PATCH 1/5] Update release version to 28 for dicker labels/env in factory-parameters Signed-off-by: Peter Robinson --- fedora.conf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fedora.conf b/fedora.conf index e6e7f82..e04d70d 100644 --- a/fedora.conf +++ b/fedora.conf @@ -294,8 +294,8 @@ image_build = { 'factory-parameters': { 'dockerversion': "1.10.1", 'docker_cmd': '[ "/bin/bash" ]', - 'docker_env': '[ "DISTTAG=f27container", "FGC=f27" ]', - 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "27"}', + 'docker_env': '[ "DISTTAG=f28container", "FGC=f28" ]', + 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "28"}', }, }, { @@ -314,8 +314,8 @@ image_build = { 'factory-parameters': { 'dockerversion': "1.10.1", 'docker_cmd': '[ "/bin/bash" ]', - 'docker_env': '[ "DISTTAG=f27container", "FGC=f27" ]', - 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "27"}', + 'docker_env': '[ "DISTTAG=f28container", "FGC=f28" ]', + 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "28"}', }, } ], From 487ab8083f272c6e18c77d217d743856559dd16d Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 14 Feb 2018 17:38:22 +0000 Subject: [PATCH 2/5] drop legacy exclude updates, all arches are merged in F-27+ Signed-off-by: Peter Robinson --- nightly.sh | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/nightly.sh b/nightly.sh index 2252405..bcb3dd3 100755 --- a/nightly.sh +++ b/nightly.sh @@ -187,17 +187,5 @@ for tomail in $TOMAIL ; do mutt -e "set from=\"$FROM\"" -e 'set envelope_from=yes' -s "$SUBJECT" $tomail done -for koji in arm ppc s390 -do - if [ "$koji" = "arm" ]; then - arches=aarch64 - elif [ "$koji" = "ppc" ]; then - arches=ppc64,ppc64le - elif [ "$koji" = "s390" ]; then - arches=s390x - fi - ./releng/scripts/srpm-excluded-arch.py -a $arches --path $DESTDIR/compose/Everything/source/tree/Packages/ >$DESTDIR/logs/excludearch-$koji.log -done - find $TARGET_DIR -xdev -depth -maxdepth 2 -mtime +14 -exec rm -rf {} \; From eaf03b3f3d7b9d7315d5ce1d73c8d7020aba075f Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 14 Feb 2018 17:32:55 +0000 Subject: [PATCH 3/5] With aarch64 Server/Cloud/Docker promotion to primary status the Server install/Cloud images are blocking if they don't exisit Signed-off-by: Peter Robinson --- fedora.conf | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/fedora.conf b/fedora.conf index e04d70d..a64acf4 100644 --- a/fedora.conf +++ b/fedora.conf @@ -331,7 +331,7 @@ image_build = { 'repo': 'Cloud', 'install_tree_from': 'Cloud', 'subvariant': 'Cloud_Base', - 'failable': ['aarch64', 'ppc64', 'ppc64le'], + 'failable': ['ppc64', 'ppc64le'], } }, { @@ -608,8 +608,7 @@ failable_deliverables = [ ('^.*$', { # Buildinstall is non blocking 'src': ['buildinstall'], - # Nothing on aarch64, i386, ppc64, ppc64le blocks the compose - 'aarch64': ['buildinstall', 'iso'], + # Nothing on i386, ppc64, ppc64le blocks the compose 'i386': ['buildinstall', 'iso'], 'ppc64': ['buildinstall', 'iso'], 'ppc64le': ['buildinstall', 'iso'], From d6c554ecddb3d34e3695af2e144a22130c1f19d3 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Thu, 15 Feb 2018 14:38:07 +0000 Subject: [PATCH 4/5] aarch promtion covers cloud and containers as well, sync Cloud/Container images to primary, sync cloud installer to alt (like x86_64), sync remain bits to fedora-secondary Signed-off-by: Peter Robinson --- nightly.sh | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/nightly.sh b/nightly.sh index bcb3dd3..28c6ede 100755 --- a/nightly.sh +++ b/nightly.sh @@ -126,11 +126,11 @@ $RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 --arch src \ # aarch64 for Server and Everything is primary $RSYNCPREFIX compose-partial-copy --arch=aarch64 \ "$DESTDIR" "$RSYNCTARGET/" \ - --variant Everything --variant Server \ + --variant Everything --variant Server --variant CloudImages --variant Docker \ --link-dest="$RSYNCTARGET/Everything" --exclude=repodata $RSYNCPREFIX compose-partial-copy --arch=aarch64 \ "$DESTDIR" "$RSYNCTARGET/" \ - --variant Everything --variant Server --variant \ + --variant Everything --variant Server --variant CloudImages --variant Docker \ --link-dest="$RSYNCTARGET/Everything" --delete-after $RSYNCPREFIX rm "$RSYNCTARGET/.composeinfo" $RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCTARGET/" --name "$NEWCOMPOSE_ID" @@ -139,11 +139,11 @@ $RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCTARGET/" --name "$NEWCOMP if [ ! -d "$RSYNCALTTARGET" ]; then mkdir "$RSYNCALTTARGET" fi -$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 \ +$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 --arch=aarch64 \ "$DESTDIR" "$RSYNCALTTARGET/" \ --variant Cloud --variant Labs \ --link-dest="$RSYNCTARGET/Everything/" --exclude=repodata -$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 \ +$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 --arch=aarch64 \ "$DESTDIR" "$RSYNCALTTARGET/" \ --variant Cloud --variant Labs \ --link-dest="$RSYNCTARGET/Everything/" --delete-after @@ -160,7 +160,7 @@ $RSYNCPREFIX compose-partial-copy --arch=i386 --arch=ppc64 --arch=ppc64le --arch $RSYNCPREFIX compose-partial-copy --arch=i386 --arch=ppc64 --arch=ppc64le --arch=s390x \ "$DESTDIR" "$RSYNCSECTARGET/" \ --link-dest="$RSYNCTARGET/Everything/" --delete-after -# aarch64 is alternative for Atomic Cloud CloudImages Container Labs Spins Workstation +# aarch64 is alternative for Atomic Labs Spins Workstation $RSYNCPREFIX compose-partial-copy --arch=i386 --arch=ppc64 --arch=ppc64le --arch=s390x \ "$DESTDIR" "$RSYNCSECTARGET/" \ --variant Atomic --variant Cloud --variant CloudImages --variant Docker --variant Labs --variant Spins --variant Workstation \ @@ -169,6 +169,14 @@ $RSYNCPREFIX compose-partial-copy --arch=i386 --arch=ppc64 --arch=ppc64le --arch "$DESTDIR" "$RSYNCSECTARGET/" \ --variant Atomic --variant Cloud --variant CloudImages --variant Docker --variant Labs --variant Spins --variant Workstation \ --link-dest="$RSYNCTARGET/Everything/" --delete-after +$RSYNCPREFIX compose-partial-copy --arch=aarch64 \ + "$DESTDIR" "$RSYNCSECTARGET/" \ + --variant Atomic --variant Labs --variant Spins --variant Workstation \ + --link-dest="$RSYNCTARGET/Everything/" --exclude=repodata +$RSYNCPREFIX compose-partial-copy --arch=aarch64 \ + "$DESTDIR" "$RSYNCSECTARGET/" \ + --variant Atomic --variant Labs --variant Spins --variant Workstation \ + --link-dest="$RSYNCTARGET/Everything/" --delete-after $RSYNCPREFIX rm "$RSYNCSECTARGET/.composeinfo" $RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCSECTARGET/" --name "$NEWCOMPOSE_ID" From 1218de2001bcfaffc12472b7bc3b98011102897d Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 19 Feb 2018 15:05:10 +0000 Subject: [PATCH 5/5] Sync the aarch64 Cloud installer to secondary rather than Alt Signed-off-by: Peter Robinson --- nightly.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nightly.sh b/nightly.sh index 28c6ede..5e01996 100755 --- a/nightly.sh +++ b/nightly.sh @@ -139,11 +139,11 @@ $RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCTARGET/" --name "$NEWCOMP if [ ! -d "$RSYNCALTTARGET" ]; then mkdir "$RSYNCALTTARGET" fi -$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 --arch=aarch64 \ +$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 \ "$DESTDIR" "$RSYNCALTTARGET/" \ --variant Cloud --variant Labs \ --link-dest="$RSYNCTARGET/Everything/" --exclude=repodata -$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 --arch=aarch64 \ +$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 \ "$DESTDIR" "$RSYNCALTTARGET/" \ --variant Cloud --variant Labs \ --link-dest="$RSYNCTARGET/Everything/" --delete-after @@ -171,11 +171,11 @@ $RSYNCPREFIX compose-partial-copy --arch=i386 --arch=ppc64 --arch=ppc64le --arch --link-dest="$RSYNCTARGET/Everything/" --delete-after $RSYNCPREFIX compose-partial-copy --arch=aarch64 \ "$DESTDIR" "$RSYNCSECTARGET/" \ - --variant Atomic --variant Labs --variant Spins --variant Workstation \ + --variant Atomic --variant Cloud --variant Labs --variant Spins --variant Workstation \ --link-dest="$RSYNCTARGET/Everything/" --exclude=repodata $RSYNCPREFIX compose-partial-copy --arch=aarch64 \ "$DESTDIR" "$RSYNCSECTARGET/" \ - --variant Atomic --variant Labs --variant Spins --variant Workstation \ + --variant Atomic --variant Cloud --variant Labs --variant Spins --variant Workstation \ --link-dest="$RSYNCTARGET/Everything/" --delete-after $RSYNCPREFIX rm "$RSYNCSECTARGET/.composeinfo" $RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCSECTARGET/" --name "$NEWCOMPOSE_ID"