diff options
| -rw-r--r-- | INSTALL | 4 | ||||
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | TODO | 1 | ||||
| -rwxr-xr-x | bin/reproducible_create_meta_pkg_sets.sh | 2 | ||||
| -rw-r--r-- | job-cfg/dpkg.yaml | 10 |
5 files changed, 7 insertions, 12 deletions
@@ -16,7 +16,7 @@ See link:https://jenkins.debian.net/userContent/about.html["about jenkins.debian === Installed software that makes jenkins.debian.net run -link:https://jenkins.debian.net[jenkins.debian.net] runs Debian wheezy. +link:https://jenkins.debian.net[jenkins.debian.net] runs Debian jessie. === Jenkins @@ -24,7 +24,7 @@ Currently running the long term support .deb from jenkins-ci.org. Jenkins is installed using 'deb http://pkg.jenkins-ci.org/debian-stable binary/' into '/etc/apt/sources.list.d/jenkins.list' and `apt-get update && apt-get install jenkins`. -I would prefer to run a jenkins package from wheezy-backports. +I would prefer to run a jenkins package from jessie-backports. ==== Jenkins plugins @@ -64,7 +64,7 @@ Installation tests with g-i, the graphical version of d-i, the debian-installer. ** while this job is triggered on commits, the SCM is only polled every 15min to see if there are new commits. * 'd_i_manual_$language_html' -** builds a language (on wheezy) on every commit of svn/trunk/manual/$LANG with `make languages=$LANG architectures=amd64 formats=html`. +** builds a language (on jessie) on every commit of svn/trunk/manual/$LANG with `make languages=$LANG architectures=amd64 formats=html`. ** while these jobs are triggered on commits, the SCM is only polled every 15min to see if there are new commits. ** on successful build, 'd_i_manual_$lang_pdf' is triggered. @@ -91,7 +91,6 @@ The plan is to run a jenkins.d.o host, which is maintained by DSA, but we are ma * bin/g-i-installation: use lvcreate without --virtualsize * check if the sudo workaround in bin/g-i-installation is still needed: 'guestmount -o uid=$(id -u) -o gid=$(id -g)' would be nicer, but it doesnt work: as root, the files seem to belong to jenkins, but as jenkins they cannot be accessed. * reproducible: let the scheduler use the xz-compressed file instead of the gzip one. This is because of missing lzma module in wheezy's python. -* job-cfg/dpkg.yaml: drop source:jenkins-dpkg-jessie, these jobs dont need a schroot === To be done once bugs are fixed diff --git a/bin/reproducible_create_meta_pkg_sets.sh b/bin/reproducible_create_meta_pkg_sets.sh index eb06306c..5eacb91e 100755 --- a/bin/reproducible_create_meta_pkg_sets.sh +++ b/bin/reproducible_create_meta_pkg_sets.sh @@ -80,7 +80,7 @@ update_if_similar() { get_installable_set() { set +e - schroot --directory /tmp -c source:jenkins-dpkg-jessie -- dose-deb-coinstall --deb-native-arch=$ARCH --bg=$PACKAGES --fg=${TMPFILE2} > $TMPFILE + dose-deb-coinstall --deb-native-arch=$ARCH --bg=$PACKAGES --fg=${TMPFILE2} > $TMPFILE RESULT=$? if [ $RESULT -ne 0 ] ; then rm $TMPFILE diff --git a/job-cfg/dpkg.yaml b/job-cfg/dpkg.yaml index 38a272ef..d1164382 100644 --- a/job-cfg/dpkg.yaml +++ b/job-cfg/dpkg.yaml @@ -54,17 +54,13 @@ - '{name}_jessie_find_trigger_cycles': my_description: 'Find dpkg trigger cycles in Debian jessie.' my_time: '0 10 * * *' - my_shell: 'schroot --directory /tmp -c source:jenkins-dpkg-jessie /srv/jenkins/bin/find_dpkg_trigger_cycles.sh jessie' + my_shell: '/srv/jenkins/bin/find_dpkg_trigger_cycles.sh jessie' - '{name}_stretch_find_trigger_cycles': my_description: 'Find dpkg trigger cycles in Debian stretch.' my_time: '0 10 * * *' - my_shell: 'schroot --directory /tmp -c source:jenkins-dpkg-jessie /srv/jenkins/bin/find_dpkg_trigger_cycles.sh stretch' + my_shell: '/srv/jenkins/bin/find_dpkg_trigger_cycles.sh stretch' - '{name}_sid_find_trigger_cycles': my_description: 'Find dpkg trigger cycles in Debian sid.' my_time: '0 12 * * *' - my_shell: 'schroot --directory /tmp -c source:jenkins-dpkg-jessie /srv/jenkins/bin/find_dpkg_trigger_cycles.sh sid' - - '{name}_setup_schroot_jessie': - my_description: 'Setup schroot for running the dpkg_(jessie|stretch|sid)_find_trigger_cycles and reproducible_create_meta_pkg_sets jobs in a jessie environment.' - my_time: '23 8 * * 1' - my_shell: '/srv/jenkins/bin/schroot-create.sh dpkg-jessie jessie python apt-file dose-extra' + my_shell: '/srv/jenkins/bin/find_dpkg_trigger_cycles.sh sid' |