diff options
| author | Holger Levsen <holger@layer-acht.org> | 2015-01-15 12:22:21 +0100 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2015-01-15 12:22:21 +0100 |
| commit | 781ddbfc08ab5322918554b6f242b6f6e82df182 (patch) | |
| tree | 58ee6cc35e33e29937e4acb2341edb551bd74bea | |
| parent | ee75defbbdc0368720b37ad0c130cf752b49089f (diff) | |
| download | jenkins.debian.net-781ddbfc08ab5322918554b6f242b6f6e82df182.tar.xz | |
reproducible: fixup several meta pkg sets, run job more often
| -rwxr-xr-x | bin/reproducible_create_meta_pkg_sets.sh | 23 | ||||
| -rw-r--r-- | job-cfg/reproducible.yaml | 2 |
2 files changed, 12 insertions, 13 deletions
diff --git a/bin/reproducible_create_meta_pkg_sets.sh b/bin/reproducible_create_meta_pkg_sets.sh index 753e1f0c..c5f54881 100755 --- a/bin/reproducible_create_meta_pkg_sets.sh +++ b/bin/reproducible_create_meta_pkg_sets.sh @@ -18,24 +18,25 @@ ARCH=amd64 SUITE=sid DISTNAME="$SUITE-$ARCH" -PACKAGES=`echo $CHPATH/$DISTNAME/var/lib/apt/lists/*_dists_${SUITE}_main_binary-${ARCH}_Packages` -SOURCES=`echo $CHPATH/$DISTNAME/var/lib/apt/lists/*_dists_${SUITE}_main_source_Sources` -TMPFILE=$(mktemp) -TMPFILE2=$(mktemp) # delete possibly existing dist cd $CHPATH rm -rf $DISTNAME cd - -# the "[arch=amd64]" is a workaround until #774685 is fixed -chdist --data-dir=$CHPATH --arch=$ARCH create $DISTNAME "[arch=amd64]" $MIRROR $SUITE main +# the "[arch=$ARCH]" is a workaround until #774685 is fixed +chdist --data-dir=$CHPATH --arch=$ARCH create $DISTNAME "[arch=$ARCH]" $MIRROR $SUITE main chdist --data-dir=$CHPATH --arch=$ARCH apt-get $DISTNAME update +PACKAGES=$(ls $CHPATH/$DISTNAME/var/lib/apt/lists/*_dists_${SUITE}_main_binary-${ARCH}_Packages) +SOURCES=$(ls $CHPATH/$DISTNAME/var/lib/apt/lists/*_dists_${SUITE}_main_source_Sources) +TMPFILE=$(mktemp) +TMPFILE2=$(mktemp) + # helper functions convert_into_source_packages_only() { rm -f ${TMPFILE2} - ALL_PKGS=$(cat $TMPFILE | cut -d ":" -f1 | sed "s#([^()]*)##g ; s#\[[^][]*\]##g ; s#,##g" |sort -u ) + ALL_PKGS=$(cat $TMPFILE | cut -d ":" -f1 | sed "s#([^()]*)##g ; s#\[[^][]*\]##g ; s#,##g ; s# #\n#g" |sort -u ) for PKG in $ALL_PKGS ; do SRC="" if [ ! -z "$PKG" ] ; then @@ -95,16 +96,14 @@ update_if_similar() { # the essential package set if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[1]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[3]}.pkgset ] ; then - chdist --data-dir=$CHPATH grep-dctrl-packages $DISTNAME -X -FEssential yes > ${TMPFILE2} - schroot --directory /tmp -c source:jenkins-dpkg-jessie -- dose-deb-coinstall --deb-native-arch=$ARCH --bg=$PACKAGES --fg=${TMPFILE2} > $TMPFILE + chdist --data-dir=$CHPATH grep-dctrl-packages $DISTNAME -X -FEssential yes > $TMPFILE convert_from_deb822_into_source_packages_only update_if_similar ${META_PKGSET[1]}.pkgset fi # the required package set if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[2]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[2]}.pkgset ] ; then - chdist --data-dir=$CHPATH grep-dctrl-packages $DISTNAME -X -FPriority required > ${TMPFILE2} - schroot --directory /tmp -c source:jenkins-dpkg-jessie -- dose-deb-coinstall --deb-native-arch=$ARCH --bg=$PACKAGES --fg=${TMPFILE2} > $TMPFILE + chdist --data-dir=$CHPATH grep-dctrl-packages $DISTNAME -X -FPriority required > $TMPFILE convert_from_deb822_into_source_packages_only update_if_similar ${META_PKGSET[2]}.pkgset fi @@ -112,6 +111,7 @@ fi # build-essential if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[3]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[3]}.pkgset ] ; then chdist --data-dir=$CHPATH grep-dctrl-packages $DISTNAME -X \( -FBuild-Essential yes --or -FPackage build-essential \) > ${TMPFILE2} + # here we want the installable set: schroot --directory /tmp -c source:jenkins-dpkg-jessie -- dose-deb-coinstall --deb-native-arch=$ARCH --bg=$PACKAGES --fg=${TMPFILE2} > $TMPFILE convert_from_deb822_into_source_packages_only update_if_similar ${META_PKGSET[3]}.pkgset @@ -210,7 +210,6 @@ fi # pkg-perl-maintainers if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[13]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[13]}.pkgset ] ; then grep-dctrl -sPackage -n -FMaintainer pkg-perl-maintainers@lists.alioth.debian.org $SOURCES > $TMPFILE - convert_into_source_packages_only update_if_similar ${META_PKGSET[13]}.pkgset fi diff --git a/job-cfg/reproducible.yaml b/job-cfg/reproducible.yaml index 50eb44c0..c5ff65bc 100644 --- a/job-cfg/reproducible.yaml +++ b/job-cfg/reproducible.yaml @@ -238,7 +238,7 @@ my_recipients: 'holger@layer-acht.org' - '{name}_create_meta_pkg_sets': my_description: 'Create meta package sets for later consumption when generating HTML stats.' - my_timed: '0 6 1 * *' + my_timed: '0 6 * * H/3' my_shell: '/srv/jenkins/bin/reproducible_create_meta_pkg_sets.sh' my_recipients: 'holger@layer-acht.org' - '{name}_builder_alpha': |