See <https://jenkins.tails.boum.org/job/build_Tails_ISO_experimental/2269/changes>
Changes: [anonym] Add dummy changelog entry for Tails 1.4.1. [anonym] Restore stable's base branch. [intrigeri] Remove files that are not under version control when building in Jenkins. [intrigeri] Don't modify files in the source tree before having possibly merged the base branch into it. ------------------------------------------ [...truncated 32 lines...] + [ -z /srv/www ] + [ -z origin/experimental ] + [ -z 26ed3a5969c9c0f34a76a8f7f9336455c04db423 ] + REV=experimental + COMMIT=26ed3a5969c9c0f34a76a8f7f9336455c04db423 + ARTIFACTS_DIR=/srv/www/build_Tails_ISO_experimental + cd <https://jenkins.tails.boum.org/job/build_Tails_ISO_experimental/ws/> + git checkout --force experimental Switched to a new branch 'experimental' Branch experimental set up to track remote branch experimental from origin. + git reset --hard 26ed3a5969c9c0f34a76a8f7f9336455c04db423 HEAD is now at 26ed3a5 Merge branch 'bugfix/9406-jenkins-build-in-clean-git' into experimental + [ -n https://jenkins.tails.boum.org/ ] + git clean --force -d -x + install -m 0755 -d /srv/www/build_Tails_ISO_experimental + [ yes ] + as_root_do lb clean --all + sudo http_proxy=http://apt-proxy.lizard:3142 JENKINS_URL=https://jenkins.tails.boum.org/ lb clean --all [1;37mP[0m: Executing auto/clean script. + mountpoint -q chroot/{dev/pts,proc,sys,var/lib/dpkg} + lb clean noauto --all P: Cleaning chroot + rm -f config/binary config/bootstrap config/chroot config/common config/source + ls config/APT_overlays.d/ config/binary_local-hooks/ config/binary_local-includes/ config/binary_rootfs/ config/chroot_apt/ config/chroot_local-hooks/ config/chroot_local-includes/ config/chroot_local-packages/ config/chroot_local-packageslists/ config/chroot_local-patches/ config/chroot_local-preseed/ config/chroot_sources/ + rmdir --ignore-fail-on-non-empty config/APT_overlays.d/ config/binary_local-hooks/ config/binary_local-includes/ config/binary_rootfs/ config/chroot_apt/ config/chroot_local-hooks/ config/chroot_local-includes/ config/chroot_local-packages/ config/chroot_local-packageslists/ config/chroot_local-patches/ config/chroot_local-preseed/ config/chroot_sources/ + rm -f config/chroot_local-includes/etc/amnesia/environment + rm -f config/chroot_local-includes/etc/amnesia/version + rm -f config/chroot_local-includes/usr/share/doc/amnesia/Changelog + [ config/chroot_local-packageslists/tails-common.list != config/chroot_local-packageslists/tails-common.list ] + rm -f config/chroot_local-includes/usr/share/amnesia/build/variables + rm -rf config/chroot_local-includes/usr/share/doc/tails/website wiki/src/.ikiwiki + find wiki/src -name *.pot -exec rm {} ; + [ -z https://jenkins.tails.boum.org/ ] + mktemp -d /tmp/tails-build.XXXXXXXX + BUILD_DIR=/tmp/tails-build.CD52v9BZ + [ yes ] + mktemp -d /tmp/tmpfs.XXXXXXXX + TMPFS_DIR=/tmp/tmpfs.rqJ1fLQW + as_root_do mount -t tmpfs -o noatime,size=100%,mode=0770,uid=root,gid=jenkins tmpfs /tmp/tmpfs.rqJ1fLQW + sudo http_proxy=http://apt-proxy.lizard:3142 JENKINS_URL=https://jenkins.tails.boum.org/ mount -t tmpfs -o noatime,size=100%,mode=0770,uid=root,gid=jenkins tmpfs /tmp/tmpfs.rqJ1fLQW + as_root_do mount -t aufs -o noatime,noxino,dirs=/tmp/tmpfs.rqJ1fLQW=rw:<https://jenkins.tails.boum.org/job/build_Tails_ISO_experimental/ws/=rr+wh> aufs /tmp/tails-build.CD52v9BZ + sudo http_proxy=http://apt-proxy.lizard:3142 JENKINS_URL=https://jenkins.tails.boum.org/ mount -t aufs -o noatime,noxino,dirs=/tmp/tmpfs.rqJ1fLQW=rw:<https://jenkins.tails.boum.org/job/build_Tails_ISO_experimental/ws/=rr+wh> aufs /tmp/tails-build.CD52v9BZ + cd /tmp/tails-build.CD52v9BZ + as_root_do lb config --cache false + sudo http_proxy=http://apt-proxy.lizard:3142 JENKINS_URL=https://jenkins.tails.boum.org/ lb config --cache false [1;37mP[0m: Executing auto/config script. + git rev-parse --is-inside-work-tree true + . config/amnesia + AMNESIA_APPEND=live-media=removable apparmor=1 security=apparmor nopersistent noprompt timezone=Etc/UTC block.events_dfl_poll_msecs=1000 splash noautologin module=Tails + AMNESIA_ISOHYBRID_OPTS=-h 255 -s 63 + REQUIRED_SYSLINUX_UTILS_UPSTREAM_VERSION=6.03~pre20 + which dpkg-parsechangelog + [ ! -x /usr/bin/dpkg-parsechangelog ] + date --utc +%Y%m%dT%H%MZ + AMNESIA_NOW=20150515T0928Z + date +%Y%m%d + AMNESIA_TODAY=20150515 + dpkg-parsechangelog + sed -n s/^Version: //p + AMNESIA_VERSION=1.5 + AMNESIA_FULL_VERSION=1.5 - 20150515 + AMNESIA_DEV_FULLNAME=Tails developers + [email protected] + AMNESIA_DEV_KEYID=A490 D0F4 D311 A415 3E2B B7CA DBB8 02B2 58AC D84F + [ -e config/amnesia.local ] + RUN_LB_CONFIG=lb config noauto + lb config noauto --distribution wheezy --cache false [1;37mP[0m: Considering defaults defined in /etc/live/build.conf P: Updating config tree + lb config noauto --apt-recommends false --backports false --binary-images iso --binary-indices false --checksums none --bootappend-live live-media=removable apparmor=1 security=apparmor nopersistent noprompt timezone=Etc/UTC block.events_dfl_poll_msecs=1000 splash noautologin module=Tails --bootstrap cdebootstrap --archive-areas main contrib non-free --includes none --iso-application=The Amnesic Incognito Live System --iso-publisher=https://tails.boum.org/ --iso-volume=TAILS 1.5 - 20150515 --memtest none --mirror-binary http://ftp.us.debian.org/debian/ --mirror-bootstrap http://ftp.us.debian.org/debian/ --mirror-chroot http://ftp.us.debian.org/debian/ --packages-lists=standard --tasks=standard --linux-packages=linux-image-3.16.0-4 --syslinux-menu vesamenu --syslinux-splash data/splash.png --syslinux-timeout 4 --initramfs=live-boot --cache false [1;37mP[0m: Considering defaults defined in /etc/live/build.conf P: Updating config tree + dpkg --print-architecture + hw_arch=amd64 + [ amd64 = i386 -o amd64 = amd64 ] + lb config noauto --architecture i386 --linux-flavours 586 amd64 --cache false [1;37mP[0m: Considering defaults defined in /etc/live/build.conf P: Updating config tree + install -d config/chroot_local-includes/etc/amnesia/ + ikiwiki-supported-languages ikiwiki.setup + TAILS_WIKI_SUPPORTED_LANGUAGES=en de fr pt + [ -n en de fr pt ] + echo TAILS_WIKI_SUPPORTED_LANGUAGES='en de fr pt' + echo 1.5 - 20150515 + git rev-list HEAD + + head -n 1 git rev-list HEAD + dpkg-query -W -f=${Version}\n live-build + echo live-build: 3.0.5+really+is+2.0.12-0.tails1 + cat + cp debian/changelog config/chroot_local-includes/usr/share/doc/amnesia/Changelog + [ -e config/binary_rootfs/squashfs.sort ] + mkdir -p config/chroot_local-includes/usr/share/amnesia + sort+ -k2 -n -r config/binary_rootfs/squashfs.sort cut -d -f1 + tails-custom-apt-sources + as_root_do lb build + sudo http_proxy=http://apt-proxy.lizard:3142 JENKINS_URL=https://jenkins.tails.boum.org/ lb build [1;37mP[0m: Executing auto/build script. + umask 022 + git rev-parse --is-inside-work-tree + . config/amnesia ++ AMNESIA_APPEND='live-media=removable apparmor=1 security=apparmor nopersistent noprompt timezone=Etc/UTC block.events_dfl_poll_msecs=1000 splash noautologin module=Tails' ++ AMNESIA_ISOHYBRID_OPTS='-h 255 -s 63' ++ REQUIRED_SYSLINUX_UTILS_UPSTREAM_VERSION=6.03~pre20 +++ which dpkg-parsechangelog ++ '[' '!' -x /usr/bin/dpkg-parsechangelog ']' +++ date --utc +%Y%m%dT%H%MZ ++ AMNESIA_NOW=20150515T0928Z +++ date +%Y%m%d ++ AMNESIA_TODAY=20150515 +++ dpkg-parsechangelog +++ sed -n 's/^Version: //p' ++ AMNESIA_VERSION=1.5 ++ AMNESIA_FULL_VERSION='1.5 - 20150515' ++ AMNESIA_DEV_FULLNAME='Tails developers' ++ [email protected] ++ AMNESIA_DEV_KEYID='A490 D0F4 D311 A415 3E2B B7CA DBB8 02B2 58AC D84F' + '[' -e config/amnesia.local ']' + rm -rf cache/stages_rootfs + . config/binary ++ LB_BINARY_FILESYSTEM=fat16 ++ LB_BINARY_IMAGES=iso ++ LB_BINARY_INDICES=false ++ LB_BOOTAPPEND_LIVE='live-media=removable apparmor=1 security=apparmor nopersistent noprompt timezone=Etc/UTC block.events_dfl_poll_msecs=1000 splash noautologin module=Tails' ++ LB_BOOTAPPEND_INSTALL= ++ LB_BOOTLOADER=syslinux ++ LB_CHECKSUMS=none ++ LB_BUILD_WITH_CHROOT=true ++ LB_DEBIAN_INSTALLER=false ++ LB_DEBIAN_INSTALLER_DISTRIBUTION=wheezy ++ LB_DEBIAN_INSTALLER_PRESEEDFILE= ++ LB_DEBIAN_INSTALLER_GUI=true ++ LB_ENCRYPTION=false ++ LB_GRUB_SPLASH= ++ LB_HOSTNAME=debian ++ LB_ISO_APPLICATION='The Amnesic Incognito Live System' ++ LB_ISO_PREPARER='live-build 2.0.12-2; http://packages.qa.debian.org/live-build' ++ LB_ISO_PUBLISHER=https://tails.boum.org/ ++ LB_ISO_VOLUME='TAILS 1.5 - 20150515' ++ LB_JFFS2_ERASEBLOCK= ++ LB_MEMTEST=none ++ LB_WIN32_LOADER=false ++ LB_NET_ROOT_FILESYSTEM=nfs ++ LB_NET_ROOT_MOUNTOPTIONS= ++ LB_NET_ROOT_PATH=/srv/debian-live ++ LB_NET_ROOT_SERVER=192.168.1.1 ++ LB_NET_COW_FILESYSTEM=nfs ++ LB_NET_COW_MOUNTOPTIONS= ++ LB_NET_COW_PATH= ++ LB_NET_COW_SERVER= ++ LB_NET_TARBALL=gzip ++ LB_SYSLINUX_SPLASH=data/splash.png ++ LB_SYSLINUX_TIMEOUT=4 ++ LB_SYSLINUX_CFG= ++ LB_SYSLINUX_MENU=vesamenu ++ LB_SYSLINUX_MENU_LIVE_ENTRY=Live ++ LB_SYSLINUX_MENU_LIVE_FAILSAFE_ENTRY= ++ LB_SYSLINUX_MENU_MEMTEST_ENTRY='Memory test' ++ LB_USERNAME=user + . config/bootstrap ++ LB_ARCHITECTURE=i386 ++ LB_BOOTSTRAP_CONFIG= ++ LB_BOOTSTRAP_INCLUDE= ++ LB_BOOTSTRAP_EXCLUDE= ++ LB_BOOTSTRAP_FLAVOUR= ++ LB_BOOTSTRAP_KEYRING= ++ LB_DISTRIBUTION=wheezy ++ LB_MIRROR_BOOTSTRAP=http://ftp.us.debian.org/debian/ ++ LB_MIRROR_CHROOT=http://ftp.us.debian.org/debian/ ++ LB_MIRROR_CHROOT_SECURITY=http://security.debian.org/ ++ LB_MIRROR_CHROOT_VOLATILE=none ++ LB_MIRROR_CHROOT_BACKPORTS=none ++ LB_MIRROR_BINARY=http://ftp.us.debian.org/debian/ ++ LB_MIRROR_BINARY_SECURITY=http://security.debian.org/ ++ LB_MIRROR_BINARY_VOLATILE=none ++ LB_MIRROR_BINARY_BACKPORTS=none ++ LB_MIRROR_DEBIAN_INSTALLER=http://ftp.de.debian.org/debian/ ++ LB_ARCHIVE_AREAS='main contrib non-free' + echo LB_DISTRIBUTION=wheezy ++ /bin/grep -E --no-filename '[^ #]*\.in$' po/POTFILES.in ++ sed -e 's,^config/chroot_local-includes,,' ++ tr '\n' ' ' + echo 'POTFILES_DOT_IN='\''/etc/skel/Desktop/Report_an_error.desktop.in /etc/skel/Desktop/tails-documentation.desktop.in /usr/share/applications/tails-documentation.desktop.in /usr/share/applications/i2p-browser.desktop.in /usr/share/applications/tails-about.desktop.in /usr/share/applications/tails-reboot.desktop.in /usr/share/applications/tails-shutdown.desktop.in /usr/share/applications/tor-browser.desktop.in /usr/share/applications/unsafe-browser.desktop.in /usr/share/desktop-directories/Tails.directory.in '\''' + chmod -R go+rX config/binary_local-includes/ + chmod -R go+rX config/chroot_local-includes/etc + chmod 0440 config/chroot_local-includes/etc/sudoers.d/always-ask-password config/chroot_local-includes/etc/sudoers.d/zzz_boot_profile config/chroot_local-includes/etc/sudoers.d/zzz_halt config/chroot_local-includes/etc/sudoers.d/zzz_persistence-setup config/chroot_local-includes/etc/sudoers.d/zzz_tails-debugging-info config/chroot_local-includes/etc/sudoers.d/zzz_tor-has-bootstrapped config/chroot_local-includes/etc/sudoers.d/zzz_tor-launcher config/chroot_local-includes/etc/sudoers.d/zzz_unsafe-browser config/chroot_local-includes/etc/sudoers.d/zzz_upgrade + chmod go+rX config/chroot_local-includes/home + chmod go+rX config/chroot_local-includes/lib + chmod go+rX config/chroot_local-includes/lib/live + chmod -R go+rx config/chroot_local-includes/lib/live/config + chmod go+rX config/chroot_local-includes/live + chmod -R go+rX config/chroot_local-includes/usr + chmod -R go+rx config/chroot_local-includes/usr/local/bin + chmod -R go+rx config/chroot_local-includes/usr/local/sbin + chmod -R go+rX config/chroot_local-includes/usr/share/doc/tails chmod: cannot access `config/chroot_local-includes/usr/share/doc/tails': No such file or directory + chmod -R go+rX config/chroot_local-includes/var + chmod -R go+rX config/chroot_apt + chmod -R go+rX config/chroot_sources + : -comp xz -Xbcj x86 -b 1024K -Xdict-size 1024K + MKSQUASHFS_OPTIONS='-comp xz -Xbcj x86 -b 1024K -Xdict-size 1024K -wildcards -ef chroot/usr/share/amnesia/build/mksquashfs-excludes' + export MKSQUASHFS_OPTIONS ++ git symbolic-ref HEAD + GIT_REF=refs/heads/experimental + GIT_BRANCH=experimental ++ echo experimental ++ sed s,/,_,g + CLEAN_GIT_BRANCH=experimental + '[' -n https://jenkins.tails.boum.org/ ']' ++ git rev-parse --short HEAD + GIT_SHORT_ID=26ed3a5 + BUILD_BASENAME=tails-i386-experimental-1.5-20150515T0928Z-26ed3a5 ++ head -n1 config/base_branch + GIT_BASE_BRANCH=devel + '[' -n https://jenkins.tails.boum.org/ ']' + '[' -z '' ']' + '[' experimental '!=' devel ']' ++ git rev-parse origin/devel + GIT_BASE_BRANCH_COMMIT=86a5b06ef351c702e54c715091afd6bfb31a3088 + echo 'Merging base branch origin/devel' Merging base branch origin/devel + echo '(at commit 86a5b06ef351c702e54c715091afd6bfb31a3088)...' (at commit 86a5b06ef351c702e54c715091afd6bfb31a3088)... + git merge --no-edit origin/devel Auto-merging debian/changelog CONFLICT (content): Merge conflict in debian/changelog Automatic merge failed; fix conflicts and then commit the result. + fatal 'Failed to merge base branch.' + echo 'Failed to merge base branch.' Failed to merge base branch. + exit 1 + cleanup + [ -n /tmp/tails-build.CD52v9BZ ] + cd / + mount+ grep -E ^[^[:space:]]+ on /tmp/tails-build.CD52v9BZ + awk {print $3} + sort -r + mounts=/tmp/tails-build.CD52v9BZ + [ -n /tmp/tails-build.CD52v9BZ ] + sudo umount /tmp/tails-build.CD52v9BZ + [ -d /tmp/tmpfs.rqJ1fLQW ] + sudo umount /tmp/tmpfs.rqJ1fLQW + rmdir /tmp/tmpfs.rqJ1fLQW + [ -d /tmp/tails-build.CD52v9BZ ] + sudo rm -rf /tmp/tails-build.CD52v9BZ Build step 'Execute shell' marked build as failure _______________________________________________ Tails-dev mailing list [email protected] https://mailman.boum.org/listinfo/tails-dev To unsubscribe from this list, send an empty email to [email protected].
