[releng] fedretire: Update branches
by Till Maas
commit 1b063e963dc5e9387bcbd0dfe47cf6e5acc81c8f
Author: Till Maas <opensource(a)till.name>
Date: Thu Feb 19 21:29:03 2015 +0100
fedretire: Update branches
scripts/fedretire | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/scripts/fedretire b/scripts/fedretire
index 91c406b..b03931e 100755
--- a/scripts/fedretire
+++ b/scripts/fedretire
@@ -34,7 +34,7 @@ def retire(pkg, branch, reason, dryrun=False):
if __name__ == "__main__":
parser = argparse.ArgumentParser(description="Helper to retire packages")
parser.add_argument("--branch", default="master", nargs="*",
- choices=["master", "f21", "f20", "f19", "epel7", "el6",
+ choices=["master", "f22", "f21", "f20", "epel7", "el6",
"el5"])
parser.add_argument("--reasonfile", default=None)
parser.add_argument("--reason", default=None)
9 years, 2 months
[releng] Switch from pkgdb2branch to pkgdb_sync_git_branches.
by Jon Ciesla
commit 6c6b5065431349a407e9686569ac5729cf4e47e1
Author: Jon Ciesla <limburgher(a)gmail.com>
Date: Thu Feb 19 10:16:22 2015 -0600
Switch from pkgdb2branch to pkgdb_sync_git_branches.
scripts/process-git-requests/process-git-requests | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/scripts/process-git-requests/process-git-requests b/scripts/process-git-requests/process-git-requests
index 69544ea..35298b8 100755
--- a/scripts/process-git-requests/process-git-requests
+++ b/scripts/process-git-requests/process-git-requests
@@ -826,15 +826,15 @@ def process_change_request(bug, comment, allcomments, firstfound, pkgdb, branche
pass
def create_branches(package, pkghost, pkghostlocal, processed):
- '''If on pkgs01, run /usr/local/bin/pkgdb2branch.py directly. Otherwise,
+ '''If on pkgs01, run /usr/local/bin/pkgdb_sync_git_branches.py directly. Otherwise,
call ssh.'''
LOG.info('Create branches in git')
hostname = os.uname()[1]
cmd = []
if hostname != pkghostlocal:
cmd.extend(['ssh', pkghost])
- cmd.extend(['/usr/local/bin/pkgdb2branch.py', package])
- print "Calling pkgdb2branch.py...."
+ cmd.extend(['/usr/local/bin/pkgdb_sync_git_branches.py', package])
+ print "Calling pkgdb_sync_git_branches.py...."
try:
proc = subprocess.check_call(cmd, stdout=sys.stdout, stderr=sys.stderr)
except:
@@ -953,6 +953,6 @@ if __name__ == '__main__':
if len(processed):
print '\nYou must now run this on the git server\nto set up the git repository:'
- print '/usr/local/bin/pkgdb2branch.py ' + ' '.join(processed)
+ print '/usr/local/bin/pkgdb_sync_git_branches.py ' + ' '.join(processed)
sys.exit(0)
9 years, 2 months
[releng] initialise the atomic repo if it does not exist
by Dennis Gilmore
commit 0db79852e599927304c6d5c3f6f37e51495c295f
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Wed Feb 18 16:52:22 2015 -0600
initialise the atomic repo if it does not exist
scripts/run-pungi | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --git a/scripts/run-pungi b/scripts/run-pungi
index 59d4ed5..a65d097 100755
--- a/scripts/run-pungi
+++ b/scripts/run-pungi
@@ -49,6 +49,7 @@ baseurl=http://kojipkgs.fedoraproject.org/mash/bleed/$basearch/' > fedora-bleed.
sed -i -e 's|\["fedora-22"\]|\["fedora-22", "fedora-bleed"\]|g' *json
mock -r fedora-branched-compose-x86_64 --init || exit 1
mock -r fedora-branched-compose-x86_64 --install rpm-ostree || exit 1
+ mock -r fedora-branched-compose-x86_64 --shell "if [ ! -d $ATOMICDEST ]; then ostree init --repo=$ATOMICDEST --mode=archive-z2;fi"
mock -r fedora-branched-compose-x86_64 --shell "rpm-ostree compose tree --repo=$ATOMICDEST $ATOMIC/fedora-atomic-docker-host.json" || exit 1
popd
9 years, 2 months
[releng] cleanups and use the new host
by Dennis Gilmore
commit 4875516d37a98608f08b4c4946baf775af2f4fdc
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Wed Feb 18 16:35:23 2015 -0600
cleanups and use the new host
scripts/run-pungi | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/scripts/run-pungi b/scripts/run-pungi
index dae7546..59d4ed5 100755
--- a/scripts/run-pungi
+++ b/scripts/run-pungi
@@ -41,12 +41,12 @@ pushd $ATOMIC
echo '[fedora-bleed]
name=fedora-bleed
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-21-$basearch
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-22-$basearch
enabled=1
baseurl=http://kojipkgs.fedoraproject.org/mash/bleed/$basearch/' > fedora-bleed.repo
sed -i -e 's|mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-21&ar...' fedora*repo
# make sure we add the bleed repo to the json file
- sed -i -e 's|\["fedora-21"\]|\["fedora-21", "fedora-bleed"\]|g' *json
+ sed -i -e 's|\["fedora-22"\]|\["fedora-22", "fedora-bleed"\]|g' *json
mock -r fedora-branched-compose-x86_64 --init || exit 1
mock -r fedora-branched-compose-x86_64 --install rpm-ostree || exit 1
mock -r fedora-branched-compose-x86_64 --shell "rpm-ostree compose tree --repo=$ATOMICDEST $ATOMIC/fedora-atomic-docker-host.json" || exit 1
@@ -65,7 +65,7 @@ for arch in armhfp i386 x86_64
do
if [[ $arch == armhfp ]]
then HOST=arm01-releng00.arm.fedoraproject.org
- else HOST=compose-x86-02.phx2.fedoraproject.org
+ else HOST=compose-x86-01.phx2.fedoraproject.org
fi
if [[ $arch == i386 ]]
@@ -95,7 +95,7 @@ popd
hardlink -vvc $FINALDEST/$VERSION/Workstation $FINALDEST/$VERSION/Server $FINALDEST/$VERSION/Cloud
-#sg releng "./build_composeinfo $FINALDEST/$VERSION/Workstation"
+sg releng "./build_composeinfo $FINALDEST/$VERSION/Workstation"
sg releng "./build_composeinfo $FINALDEST/$VERSION/Server"
sg releng "./build_composeinfo $FINALDEST/$VERSION/Cloud"
9 years, 2 months
[releng] segregate the Cloud images and install trees
by Dennis Gilmore
commit d8ac8aa3e589008b768b4bda44d20a0b4234e5a2
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Wed Feb 18 15:22:50 2015 -0600
segregate the Cloud images and install trees
scripts/run-pungi | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/scripts/run-pungi b/scripts/run-pungi
index 7acffa0..dae7546 100755
--- a/scripts/run-pungi
+++ b/scripts/run-pungi
@@ -113,17 +113,17 @@ done
pushd $FINALDEST/$VERSION/
-sg releng "mkdir -p Images/armhfp Cloud/Images/i386 Cloud/Images/x86_64 Spins/i386 Spins/x86_64 Live/i386 Live/x86_64 Docker/x86_64 Workstation/armhfp/Images/ Workstation/x86_64/iso Workstation/i386/iso"
+sg releng "mkdir -p Images/armhfp Cloud-Images/Images/i386 Cloud-Images/Images/x86_64 Spins/i386 Spins/x86_64 Live/i386 Live/x86_64 Docker/x86_64 Workstation/armhfp/Images/ Workstation/x86_64/iso Workstation/i386/iso"
popd
USER=$(whoami)
# stage images
sg releng "sudo /usr/bin/cp -l /mnt/fedora_koji/koji/scratch/$USER/task_*/Fedora*armhfp-$SHORTVERSION-$SHORTCOMPOSE-sda.raw.xz $FINALDEST/$VERSION/Images/armhfp/"
-sg releng "sudo /usr/bin/cp -l /mnt/fedora_koji/koji/scratch/$USER/task_*/Fedora-Cloud*$DATE-$VERSION\.i386.raw.xz $FINALDEST/$VERSION/Cloud/Images/i386/"
-sg releng "sudo /usr/bin/cp -l /mnt/fedora_koji/koji/scratch/$USER/task_*/Fedora-Cloud*$DATE-$VERSION\.i386.qcow2 $FINALDEST/$VERSION/Cloud/Images/i386/"
-sg releng "sudo /usr/bin/cp -l /mnt/fedora_koji/koji/scratch/$USER/task_*/Fedora-Cloud*$DATE-$VERSION\.x86_64.raw.xz $FINALDEST/$VERSION/Cloud/Images/x86_64/"
-sg releng "sudo /usr/bin/cp -l /mnt/fedora_koji/koji/scratch/$USER/task_*/Fedora-Cloud*$DATE-$VERSION\.x86_64.qcow2 $FINALDEST/$VERSION/Cloud/Images/x86_64/"
+sg releng "sudo /usr/bin/cp -l /mnt/fedora_koji/koji/scratch/$USER/task_*/Fedora-Cloud*$DATE-$VERSION\.i386.raw.xz $FINALDEST/$VERSION/Cloud-Images/Images/i386/"
+sg releng "sudo /usr/bin/cp -l /mnt/fedora_koji/koji/scratch/$USER/task_*/Fedora-Cloud*$DATE-$VERSION\.i386.qcow2 $FINALDEST/$VERSION/Cloud-Images/Images/i386/"
+sg releng "sudo /usr/bin/cp -l /mnt/fedora_koji/koji/scratch/$USER/task_*/Fedora-Cloud*$DATE-$VERSION\.x86_64.raw.xz $FINALDEST/$VERSION/Cloud-Images/Images/x86_64/"
+sg releng "sudo /usr/bin/cp -l /mnt/fedora_koji/koji/scratch/$USER/task_*/Fedora-Cloud*$DATE-$VERSION\.x86_64.qcow2 $FINALDEST/$VERSION/Cloud-Images/Images/x86_64/"
sg releng "sudo /usr/bin/cp -l /mnt/fedora_koji/koji/scratch/$USER/task_*/Fedora-Docker*-$DATE-$VERSION*tar.gz $FINALDEST/$VERSION/Docker/x86_64/"
sg releng "sudo /usr/bin/cp -l /mnt/fedora_koji/koji/scratch/$USER/task*/*i686*$SHORTVERSION-$SHORTCOMPOSE.iso $FINALDEST/$VERSION/Spins/i386/"
@@ -151,7 +151,7 @@ for arch in i386 x86_64; do pushd $arch; sg releng "sha256sum -b *iso> Fedora-$
popd
done
-pushd $FINALDEST/$VERSION/Cloud/Images
+pushd $FINALDEST/$VERSION/Cloud-Images/Images
for arch in i386 x86_64; do pushd $arch; sg releng "sha256sum -b *qcow2 *raw.xz> Fedora-Cloud-Images-$arch-$VERSION-CHECKSUM"; popd; done
popd
@@ -174,7 +174,7 @@ popd
# stage the composed tree to final locateion
sg releng "mkdir /pub/alt/stage/$VERSION$COMPOSE/"
sg releng "chmod 700 /pub/alt/stage/$VERSION$COMPOSE/"
-for type in Docker Workstation Server Cloud Spins Live Images; do sg releng "rsync -avhH $FINALDEST/$VERSION/$type/ /pub/alt/stage/$VERSION$COMPOSE/$type/"; done
+for type in Docker Workstation Server Cloud Cloud-Images Spins Live Images; do sg releng "rsync -avhH $FINALDEST/$VERSION/$type/ /pub/alt/stage/$VERSION$COMPOSE/$type/"; done
#sg releng "chmod 755 /pub/alt/stage/$VERSION$COMPOSE/"
echo "======= compose output for trac ======="
9 years, 2 months
[releng] re-enable the workstation install tree
by Dennis Gilmore
commit 5d731c5fcf0227bf54a5a3a0b6bc1fb33b29482c
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Wed Feb 18 15:19:32 2015 -0600
re-enable the workstation install tree
scripts/run-pungi | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/scripts/run-pungi b/scripts/run-pungi
index 8399a92..7acffa0 100755
--- a/scripts/run-pungi
+++ b/scripts/run-pungi
@@ -55,7 +55,7 @@ popd
for arch in armhfp i386 x86_64
do
mock -r fedora-branched-compose-i386 --init || exit 1
- #mock -r fedora-branched-compose-i386 --shell "pungi -c $KICKSTARTS/fedora-install-workstation.ks --destdir $DESTDIR --cachedir /srv/pungi/cache/ --arch=$arch -G -C --ver $VERSION --workdirbase=/tmp/work --name Fedora-Workstation --flavor Workstation" || exit 1
+ mock -r fedora-branched-compose-i386 --shell "pungi -c $KICKSTARTS/fedora-install-workstation.ks --destdir $DESTDIR --cachedir /srv/pungi/cache/ --arch=$arch -G -C --ver $VERSION --workdirbase=/tmp/work --name Fedora-Workstation --flavor Workstation" || exit 1
mock -r fedora-branched-compose-i386 --shell "pungi -c $KICKSTARTS/fedora-install-server.ks --destdir $DESTDIR --cachedir /srv/pungi/cache/ --arch=$arch -G -C --ver $VERSION --workdirbase=/tmp/work --name Fedora-Server --flavor Server" || exit 1
mock -r fedora-branched-compose-i386 --shell "pungi -c $KICKSTARTS/fedora-install-cloud.ks --destdir $DESTDIR --cachedir /srv/pungi/cache/ --arch=$arch -G -C --ver $VERSION --workdirbase=/tmp/work --name Fedora-Cloud --flavor Cloud" || exit 1
mock -r fedora-branched-compose-i386 --clean || exit 1
@@ -78,7 +78,7 @@ do
set -x
umask 002
mock -r fedora-branched-compose-$arch --init || exit 1
- #mock -r fedora-branched-compose-$arch --shell "pungi -c $KICKSTARTS/fedora-install-workstation.ks --destdir $DESTDIR --cachedir /srv/pungi/cache/ -B -I --no-dvd --ver $VERSION --workdirbase=/tmp/work --flavor Workstation --name=Fedora-Workstation"
+ mock -r fedora-branched-compose-$arch --shell "pungi -c $KICKSTARTS/fedora-install-workstation.ks --destdir $DESTDIR --cachedir /srv/pungi/cache/ -B -I --no-dvd --ver $VERSION --workdirbase=/tmp/work --flavor Workstation --name=Fedora-Workstation"
mock -r fedora-branched-compose-$arch --shell "pungi -c $KICKSTARTS/fedora-install-server.ks --destdir $DESTDIR --cachedir /srv/pungi/cache/ -B -I --ver $VERSION --workdirbase=/tmp/work --flavor Server --name=Fedora-Server"
mock -r fedora-branched-compose-$arch --shell "pungi -c $KICKSTARTS/fedora-install-cloud.ks --destdir $DESTDIR --cachedir /srv/pungi/cache/ -B -I --no-dvd --ver $VERSION --workdirbase=/tmp/work --flavor Cloud --name=Fedora-Cloud"
mock -r fedora-branched-compose-$arch --clean || exit 1
9 years, 2 months
[releng] update the rawhide tag inhirtance. only used on primary
by Dennis Gilmore
commit 64959a9a6cd6838dd7dc77d814f653c30126f674
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Mon Feb 16 16:30:50 2015 -0600
update the rawhide tag inhirtance. only used on primary
scripts/branching/make-koji-release-tags | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/scripts/branching/make-koji-release-tags b/scripts/branching/make-koji-release-tags
index 05c8e80..b697a9d 100755
--- a/scripts/branching/make-koji-release-tags
+++ b/scripts/branching/make-koji-release-tags
@@ -40,4 +40,8 @@ $kojicli add-target f$RELEASE f$RELEASE-build
$kojicli add-target f$RELEASE-candidate f$RELEASE-build f$RELEASE
$kojicli edit-target rawhide --dest-tag=f$RELEASE --build-tag=f$RELEASE-build
+if [ "$arch" == "primary" ]; then
+$kojicli remove-tag-inheritance rawhide f$OLDRELEASE
+$kojicli add-tag-inheritance rawhide f$RELEASE
+fi
done
9 years, 2 months