[releng] make the patchs match what sudoers has
by Dennis Gilmore
commit cae3ba6f6f1eccd7e0e81c0ec0c6bdb4218606bc
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Thu Nov 13 17:19:25 2014 -0600
make the patchs match what sudoers has
scripts/buildbranched | 2 +-
scripts/buildrawhide | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/scripts/buildbranched b/scripts/buildbranched
index 93bf324..dcac91d 100755
--- a/scripts/buildbranched
+++ b/scripts/buildbranched
@@ -28,7 +28,7 @@ SUBJECT='F-'$BRANCHED' Branched report: '$DATE' changes'
FROM="Fedora Branched Report <rawhide(a)fedoraproject.org>"
RSYNCPREFIX="sudo -u ftpsync"
ATOMIC=$(mktemp -d /tmp/atomici.${DIST}.$DATE.XXXX)
-ATOMICREPO="/mnt/fedora_koji/koji/mash/atomic/$BRANCHED/"
+ATOMICREPO="/mnt/koji/mash/atomic/$BRANCHED/"
ATOMICDEST="/pub/fedora/linux/atomic/$BRANCHED/"
source ./scripts/build-functions.sh
diff --git a/scripts/buildrawhide b/scripts/buildrawhide
index f8a9eab..bcaa072 100755
--- a/scripts/buildrawhide
+++ b/scripts/buildrawhide
@@ -28,7 +28,7 @@ SUBJECT='rawhide report: '$DATE' changes'
FROM="Fedora Rawhide Report <rawhide(a)fedoraproject.org>"
RSYNCPREFIX="sudo -u ftpsync"
ATOMIC=$(mktemp -d /tmp/atomici.${DIST}.$DATE.XXXX)
-ATOMICREPO="/mnt/fedora_koji/koji/mash/atomic/$BRANCHED/"
+ATOMICREPO="/mnt/koji/mash/atomic/$BRANCHED/"
ATOMICDEST="/pub/fedora/linux/atomic/$BRANCHED/"
source ./scripts/build-functions.sh
9 years, 6 months
[releng] setup and rsync teh atomic trees
by Dennis Gilmore
commit 41e35f84be214d90d805f47449b0e7d26693f859
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Thu Nov 13 16:50:25 2014 -0600
setup and rsync teh atomic trees
scripts/build-functions.sh | 6 ++++--
scripts/buildbranched | 3 ++-
scripts/buildrawhide | 3 ++-
3 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/scripts/build-functions.sh b/scripts/build-functions.sh
index b245c27..b54e225 100644
--- a/scripts/build-functions.sh
+++ b/scripts/build-functions.sh
@@ -141,10 +141,10 @@ log "starting atomic tree creation"
MOCKCONFIG="fedora-${DIST}-compose-x86_64"
$MOCK -r $MOCKCONFIG --uniqueext=$DATE --init
$MOCK -r $MOCKCONFIG --uniqueext=$DATE --install rpm-ostree git
-$MOCK -r $MOCKCONFIG --uniqueext=$DATE --shell "if [ ! -d $ATOMICDEST ]; then ostree init --repo=$ATOMICDEST --mode=archive-z2;fi"
+$MOCK -r $MOCKCONFIG --uniqueext=$DATE --shell "if [ ! -d $ATOMICREPO ]; then ostree init --repo=$ATOMICREPO --mode=archive-z2;fi"
$MOCK -r $MOCKCONFIG --uniqueext=$DATE --shell "git clone https://git.fedorahosted.org/git/fedora-atomic.git $ATOMIC && pushd $ATOMIC && git log -n 1 --pretty='%h: %ci - %s' && git checkout ${GIT_BRANCH}"
$MOCK -r $MOCKCONFIG --uniqueext=$DATE --shell "cd $ATOMIC && sed -i -e 's|mirrorlist=.*$|baseurl=http://kojipkgs.fedoraproject.org/mash/${DIST}/x...' fedora*repo"
-$MOCK -r $MOCKCONFIG --uniqueext=$DATE --shell "rpm-ostree compose tree --repo=$ATOMICDEST $ATOMIC/fedora-atomic-docker-host.json >$logdir/atomic"
+$MOCK -r $MOCKCONFIG --uniqueext=$DATE --shell "rpm-ostree compose tree --repo=$ATOMICREPO $ATOMIC/fedora-atomic-docker-host.json >$logdir/atomic"
log "finished atomic tree creation"
}
@@ -195,6 +195,8 @@ log "started compose sync"
$RSYNCPREFIX /usr/bin/rsync $RSYNC_OPTS $RSYNC_EXTRA_OPTS --exclude repodata/ ${MASHDIR}/$BRANCHED$EXPANDARCH/ $DESTPATH
# repodata & cleanup
$RSYNCPREFIX /usr/bin/rsync $RSYNC_OPTS $RSYNC_EXTRA_OPTS --delete --delete-after ${MASHDIR}/$BRANCHED$EXPANDARCH/ $DESTPATH
+#rsync teh atomic tree
+$RSYNCPREFIX /usr/bin/rsync $RSYNC_OPTS $RSYNC_EXTRA_OPTS --delete --delete-after $ATOMICREPO $ATOMICDEST
log "finished compose sync"
if [ "$?" = "0" ]; then
diff --git a/scripts/buildbranched b/scripts/buildbranched
index c0a1020..93bf324 100755
--- a/scripts/buildbranched
+++ b/scripts/buildbranched
@@ -28,6 +28,7 @@ SUBJECT='F-'$BRANCHED' Branched report: '$DATE' changes'
FROM="Fedora Branched Report <rawhide(a)fedoraproject.org>"
RSYNCPREFIX="sudo -u ftpsync"
ATOMIC=$(mktemp -d /tmp/atomici.${DIST}.$DATE.XXXX)
-ATOMICDEST="/mnt/fedora_koji/koji/mash/atomic/$BRANCHED/"
+ATOMICREPO="/mnt/fedora_koji/koji/mash/atomic/$BRANCHED/"
+ATOMICDEST="/pub/fedora/linux/atomic/$BRANCHED/"
source ./scripts/build-functions.sh
diff --git a/scripts/buildrawhide b/scripts/buildrawhide
index e6c1137..f8a9eab 100755
--- a/scripts/buildrawhide
+++ b/scripts/buildrawhide
@@ -28,6 +28,7 @@ SUBJECT='rawhide report: '$DATE' changes'
FROM="Fedora Rawhide Report <rawhide(a)fedoraproject.org>"
RSYNCPREFIX="sudo -u ftpsync"
ATOMIC=$(mktemp -d /tmp/atomici.${DIST}.$DATE.XXXX)
-ATOMICDEST="/mnt/fedora_koji/koji/mash/atomic/$BRANCHED/"
+ATOMICREPO="/mnt/fedora_koji/koji/mash/atomic/$BRANCHED/"
+ATOMICDEST="/pub/fedora/linux/atomic/$BRANCHED/"
source ./scripts/build-functions.sh
9 years, 6 months
[releng] Drop cvs.
by Till Maas
commit 51fd8c1eaea547141ac58721fbe233ff0f58f6d2
Author: Ralph Bean <rbean(a)redhat.com>
Date: Thu Nov 13 15:30:02 2014 -0500
Drop cvs.
It seems unlikely that we would actually need it here.
scripts/build-functions.sh | 2 +-
scripts/buildepelbeta | 2 +-
scripts/mashcompose | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/scripts/build-functions.sh b/scripts/build-functions.sh
index 04c1a69..b245c27 100644
--- a/scripts/build-functions.sh
+++ b/scripts/build-functions.sh
@@ -92,7 +92,7 @@ log "git clone of comps finished"
log "mock init"
$MOCK -r $MOCKCONFIG --uniqueext=$DATE --init
log "mock install base packages"
-$MOCK -r $MOCKCONFIG --uniqueext=$DATE --no-clean --install koji yum createrepo cvs make intltool findutils mash yum-utils rsync repoview hardlink
+$MOCK -r $MOCKCONFIG --uniqueext=$DATE --no-clean --install koji yum createrepo make intltool findutils mash yum-utils rsync repoview hardlink
if [[ "${DIST}" == "branched" ]]
then
# until we move to bodhi lets not be strict about the gpg keys
diff --git a/scripts/buildepelbeta b/scripts/buildepelbeta
index 8223a4d..efe2bb5 100755
--- a/scripts/buildepelbeta
+++ b/scripts/buildepelbeta
@@ -39,7 +39,7 @@ popd
[ -f /mnt/koji/mash/epel-$DATE/logs/comps-epel7.xml ] || exit 1
mock -r $MOCKCONFIG --uniqueext=$DATE --init
-mock -r $MOCKCONFIG --uniqueext=$DATE --no-clean --install koji yum createrepo cvs make intltool findutils mash yum-utils rsync repoview
+mock -r $MOCKCONFIG --uniqueext=$DATE --no-clean --install koji yum createrepo make intltool findutils mash yum-utils rsync repoview
# Copy in the hosts file so that we get the right address for koji
mock -r $MOCKCONFIG --uniqueext=$DATE --copyin /etc/hosts /etc/hosts >/dev/null 2>&1 # this reports to fail, but actually works
mock -r $MOCKCONFIG --uniqueext=$DATE --copyin /etc/mash/epel7.mash /etc/mash/epel7.mash > /dev/null 2>&1 # this reports to fail, but actually works
diff --git a/scripts/mashcompose b/scripts/mashcompose
index 101db3d..5023797 100755
--- a/scripts/mashcompose
+++ b/scripts/mashcompose
@@ -47,7 +47,7 @@ popd
[ -f $MASHDIR/comps-f$BRANCHED.xml ] || exit 1
mock -r $MOCKCONFIG --uniqueext=$COMPOSE --init
-mock -r $MOCKCONFIG --uniqueext=$COMPOSE --no-clean --install koji yum createrepo cvs make intltool findutils mash yum-utils rsync repoview hardlink
+mock -r $MOCKCONFIG --uniqueext=$COMPOSE --no-clean --install koji yum createrepo make intltool findutils mash yum-utils rsync repoview hardlink
# disable deltas
mock -r $MOCKCONFIG --uniqueext=$COMPOSE --chroot "sed -i -e 's|delta = True|delta = False|g' /etc/mash/branched.mash"
mock -r $MOCKCONFIG --uniqueext=$COMPOSE --chroot "sed -i -e 's|[$BRANCHED]|[Everything]|g' /etc/mash/branched.mash"
9 years, 6 months
[PATCH] Drop cvs.
by Ralph Bean
It seems unlikely that we would actually need it here.
---
scripts/build-functions.sh | 2 +-
scripts/buildepelbeta | 2 +-
scripts/mashcompose | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/scripts/build-functions.sh b/scripts/build-functions.sh
index 04c1a69..b245c27 100644
--- a/scripts/build-functions.sh
+++ b/scripts/build-functions.sh
@@ -92,7 +92,7 @@ log "git clone of comps finished"
log "mock init"
$MOCK -r $MOCKCONFIG --uniqueext=$DATE --init
log "mock install base packages"
-$MOCK -r $MOCKCONFIG --uniqueext=$DATE --no-clean --install koji yum createrepo cvs make intltool findutils mash yum-utils rsync repoview hardlink
+$MOCK -r $MOCKCONFIG --uniqueext=$DATE --no-clean --install koji yum createrepo make intltool findutils mash yum-utils rsync repoview hardlink
if [[ "${DIST}" == "branched" ]]
then
# until we move to bodhi lets not be strict about the gpg keys
diff --git a/scripts/buildepelbeta b/scripts/buildepelbeta
index 8223a4d..efe2bb5 100755
--- a/scripts/buildepelbeta
+++ b/scripts/buildepelbeta
@@ -39,7 +39,7 @@ popd
[ -f /mnt/koji/mash/epel-$DATE/logs/comps-epel7.xml ] || exit 1
mock -r $MOCKCONFIG --uniqueext=$DATE --init
-mock -r $MOCKCONFIG --uniqueext=$DATE --no-clean --install koji yum createrepo cvs make intltool findutils mash yum-utils rsync repoview
+mock -r $MOCKCONFIG --uniqueext=$DATE --no-clean --install koji yum createrepo make intltool findutils mash yum-utils rsync repoview
# Copy in the hosts file so that we get the right address for koji
mock -r $MOCKCONFIG --uniqueext=$DATE --copyin /etc/hosts /etc/hosts >/dev/null 2>&1 # this reports to fail, but actually works
mock -r $MOCKCONFIG --uniqueext=$DATE --copyin /etc/mash/epel7.mash /etc/mash/epel7.mash > /dev/null 2>&1 # this reports to fail, but actually works
diff --git a/scripts/mashcompose b/scripts/mashcompose
index 101db3d..5023797 100755
--- a/scripts/mashcompose
+++ b/scripts/mashcompose
@@ -47,7 +47,7 @@ popd
[ -f $MASHDIR/comps-f$BRANCHED.xml ] || exit 1
mock -r $MOCKCONFIG --uniqueext=$COMPOSE --init
-mock -r $MOCKCONFIG --uniqueext=$COMPOSE --no-clean --install koji yum createrepo cvs make intltool findutils mash yum-utils rsync repoview hardlink
+mock -r $MOCKCONFIG --uniqueext=$COMPOSE --no-clean --install koji yum createrepo make intltool findutils mash yum-utils rsync repoview hardlink
# disable deltas
mock -r $MOCKCONFIG --uniqueext=$COMPOSE --chroot "sed -i -e 's|delta = True|delta = False|g' /etc/mash/branched.mash"
mock -r $MOCKCONFIG --uniqueext=$COMPOSE --chroot "sed -i -e 's|[$BRANCHED]|[Everything]|g' /etc/mash/branched.mash"
--
1.9.3
9 years, 6 months
Dennis afk Friday November 14
by Dennis Gilmore
Hi all,
Its a public holiday here tomorrow as such I will not be online. If needed I can be reached by telephone.
Dennis
--
Sent from my Android device with K-9 Mail. Please excuse my brevity.
9 years, 6 months