[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] drop everything live-build related

Holger Levsen gitlab at salsa.debian.org
Fri Feb 1 13:12:54 GMT 2019


Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net


Commits:
0f365396 by Holger Levsen at 2019-02-01T13:12:40Z
drop everything live-build related

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


9 changed files:

- − bin/live-build.sh
- bin/maintenance.sh
- hosts/common/etc/schroot/default/fstab
- hosts/common/etc/sudoers.d/jenkins
- hosts/jenkins-test-vm/etc/sudoers.d/jenkins
- hosts/jenkins/etc/sudoers.d/jenkins
- hosts/profitbricks-build10-amd64/etc/sudoers.d/jenkins
- − job-cfg/live.yaml
- update_jdn.sh


Changes:

=====================================
bin/live-build.sh deleted
=====================================
@@ -1,47 +0,0 @@
-#!/bin/bash
-
-# Copyright 2014-2015 Holger Levsen <holger at layer-acht.org>
-# released under the GPLv=2
-
-DEBUG=false
-. /srv/jenkins/bin/common-functions.sh
-common_init "$@"
-
-cleanup_all() {
-	sudo rm -rf --one-file-system $TMPDIR
-}
-
-TMPDIR=$(mktemp --tmpdir=/srv/live-build -d -t live-build-XXXXXXXX)
-cd $TMPDIR
-trap cleanup_all INT TERM EXIT
-
-# $1 is used for the hostname and username
-# $2 is used for the suite
-# $3 is choosing the flavor
-lb config --distribution $2 --bootappend-live "boot=live config hostname=$1 username=$1"
-cp -rv /srv/jenkins/live/config .
-case "$3" in
-	standalone)	echo education-standalone >> config/package-lists/live.list.chroot
-			echo education-desktop-xfce >> config/package-lists/live.list.chroot
-			echo education-laptop >> config/package-lists/live.list.chroot
-			;;
-	workstation)	echo education-workstation >> config/package-lists/live.list.chroot
-			echo education-desktop-xfce >> config/package-lists/live.list.chroot
-			echo education-laptop >> config/package-lists/live.list.chroot
-			;;
-	gnome)		echo task-gnome-desktop >> config/package-lists/live.list.chroot
-			;;
-	xfce)		echo task-xfce-desktop >> config/package-lists/live.list.chroot
-			;;
-	*)		;;
-esac
-sudo lb build
-mkdir -p /srv/live-build/results
-sudo cp -v live-image-amd64.hybrid.iso /srv/live-build/results/$1_$2_$3_live_amd64.iso
-echo
-echo "$(date -u) - live image created:"
-ls -lh /srv/live-build/results/$1_$2_$3_live_amd64.iso
-echo
-
-cleanup_all
-trap - INT TERM EXIT


=====================================
bin/maintenance.sh
=====================================
@@ -185,7 +185,6 @@ build_jenkins_job_health_page() {
 	FILTER[23]="g-i-installation_debian-edu_jessie"
 	FILTER[24]="g-i-installation_debian-edu_stretch"
 	FILTER[25]="debian-archive-keyring"
-	FILTER[26]="live:d-i_build"
 	numfilters=${#FILTER[@]}
 	let numfilters-=1	# that's what you get when you start counting from 0
 	write_page "<!DOCTYPE html><html lang=\"en\"><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">"


=====================================
hosts/common/etc/schroot/default/fstab
=====================================
@@ -25,4 +25,3 @@
 /srv/reproducible-results /srv/reproducible-results none rw,bind 0 0
 /srv/d-i        /srv/d-i        none    rw,bind         0        0
 /srv/jenkins    /srv/jenkins    none    rw,bind         0        0
-/srv/live-build /srv/live-build none    rw,bind         0        0


=====================================
hosts/common/etc/sudoers.d/jenkins
=====================================
@@ -15,11 +15,9 @@ jenkins ALL=  \
 	/bin/ls -la /media/*, \
 	/bin/rm -rf --one-file-system /chroots/*, \
 	/bin/rm -rf --one-file-system /schroots/*, \
-	/bin/rm -rf --one-file-system /srv/live-build/*, \
 	/bin/rm -rf --one-file-system /srv/workspace/pbuilder/*, \
 	/bin/rm -rf --one-file-system /tmp/*, \
 	/bin/rm -rv --one-file-system /tmp/*, \
-	/bin/cp -v *.iso /srv/live-build/results/*, \
 	/bin/mv /chroots/* /schroots/*, \
 	/bin/mv /schroots/* /schroots/*, \
 	/bin/umount -l /chroots/*, \


=====================================
hosts/jenkins-test-vm/etc/sudoers.d/jenkins
=====================================
@@ -13,9 +13,7 @@ jenkins ALL=  \
 	/bin/ls -la /media/*, \
 	/bin/rm -rf --one-file-system /chroots/*, \
 	/bin/rm -rf --one-file-system /schroots/*, \
-	/bin/rm -rf --one-file-system /srv/live-build/*, \
 	/bin/rm -rf --one-file-system /srv/workspace/pbuilder/*, \
-	/bin/cp -v *.iso /srv/live-build/results/*, \
 	/bin/mv /chroots/* /schroots/*, \
 	/bin/mv /schroots/* /schroots/*, \
 	/bin/umount -l /chroots/*, \


=====================================
hosts/jenkins/etc/sudoers.d/jenkins
=====================================
@@ -15,11 +15,9 @@ jenkins ALL=  \
 	/bin/ls -la /media/*, \
 	/bin/rm -rf --one-file-system /chroots/*, \
 	/bin/rm -rf --one-file-system /schroots/*, \
-	/bin/rm -rf --one-file-system /srv/live-build/*, \
 	/bin/rm -rf --one-file-system /srv/workspace/pbuilder/*, \
 	/bin/rm -rf --one-file-system /tmp/*, \
 	/bin/rm -rv --one-file-system /tmp/*, \
-	/bin/cp -v *.iso /srv/live-build/results/*, \
 	/bin/mv /chroots/* /schroots/*, \
 	/bin/mv /schroots/* /schroots/*, \
 	/bin/umount -l /chroots/*, \


=====================================
hosts/profitbricks-build10-amd64/etc/sudoers.d/jenkins
=====================================
@@ -13,9 +13,7 @@ jenkins ALL=  \
 	/bin/ls -la /media/*, \
 	/bin/rm -rf --one-file-system /chroots/*, \
 	/bin/rm -rf --one-file-system /schroots/*, \
-	/bin/rm -rf --one-file-system /srv/live-build/*, \
 	/bin/rm -rf --one-file-system /srv/workspace/pbuilder/*, \
-	/bin/cp -v *.iso /srv/live-build/results/*, \
 	/bin/mv /chroots/* /schroots/*, \
 	/bin/mv /schroots/* /schroots/*, \
 	/bin/umount -l /chroots/*, \


=====================================
job-cfg/live.yaml deleted
=====================================
@@ -1,82 +0,0 @@
-- defaults:
-    name: live
-    project-type: freestyle
-    properties:
-      - sidebar:
-          url: https://jenkins.debian.net/userContent/about.html
-          text: About jenkins.debian.net
-          icon: /userContent/images/debian-swirl-24x24.png
-      - sidebar:
-          url: https://jenkins.debian.net/view/qa.debian.org/
-          text: Jobs for Debian QA related packages
-          icon: /userContent/images/debian-jenkins-24x24.png
-      - sidebar:
-          url: http://www.profitbricks.co.uk
-          text: Sponsored by Profitbricks
-          icon: /userContent/images/profitbricks-24x24.png
-    description: '{my_description}<br><br>Job configuration source is <a href="https://salsa.debian.org/qa/jenkins.debian.net/blob/master/job-cfg/live.yaml">live.yaml</a>.'
-    logrotate:
-      daysToKeep: 90
-      numToKeep: 20
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
-    publishers:
-      - email:
-          recipients: 'qa-jenkins-scm at lists.alioth.debian.org'
-    builders:
-      - shell: '{my_shell}'
-    triggers:
-      - timed: '{my_time}'
-
-#- job-template:
-#    defaults: live
-#    name: '{name}_build_debian-edu_stretch_standalone'
-
-#- job-template:
-#    defaults: live
-#    name: '{name}_build_debian-edu_stretch_workstation'
-
-- job-template:
-    defaults: live
-    name: '{name}_build_debian_stretch_gnome'
-
-- job-template:
-    defaults: live
-    name: '{name}_build_debian_stretch_xfce'
-
-- job-template:
-    defaults: live
-    name: '{name}_build_debian_sid_xfce'
-
-- job-template:
-    defaults: live
-    name: '{name}_setup_schroot'
-
-- project:
-    name: live
-    jobs:
-       #- '{name}_build_debian-edu_stretch_standalone':
-       #    my_description: 'Build Debian Edu Stretch live-image with "standlone" profile.'
-       #    my_time: '0 12 1 * *'
-       #    my_shell: 'schroot --directory /tmp -c source:jenkins-live-stretch /srv/jenkins/bin/live-build.sh debian-edu stretch standalone'
-       #- '{name}_build_debian-edu_stretch_workstation':
-       #    my_description: 'Build Debian Edu Stretch live-image with "workstation" profile.'
-       #    my_time: '0 12 1 * *'
-       #    my_shell: 'schroot --directory /tmp -c source:jenkins-live-stretch /srv/jenkins/bin/live-build.sh debian-edu stretch workstation'
-       - '{name}_build_debian_stretch_gnome':
-           my_description: 'Build Debian Stretch live-image with GNOME desktop.'
-           my_time: '0 13 1 * *'
-           my_shell: 'schroot --directory /tmp -c source:jenkins-live-stretch /srv/jenkins/bin/live-build.sh debian stretch gnome'
-       - '{name}_build_debian_stretch_xfce':
-           my_description: 'Build Debian Stretch live-image with Xfce desktop.'
-           my_time: '0 14 1 * *'
-           my_shell: 'schroot --directory /tmp -c source:jenkins-live-stretch /srv/jenkins/bin/live-build.sh debian stretch xfce'
-       - '{name}_build_debian_sid_xfce':
-           my_description: 'Build Debian Sid live-image with Xfce desktop.'
-           my_time: '0 14 2 * *'
-           my_shell: 'schroot --directory /tmp -c source:jenkins-live-stretch /srv/jenkins/bin/live-build.sh debian sid xfce'
-       - '{name}_setup_schroot':
-           my_description: 'Setup schroot for building live images using live-build in a stretch environment.'
-           my_time: '42 10 1 * *'
-           my_shell: '/srv/jenkins/bin/schroot-create.sh live-stretch stretch python live-build'
-


=====================================
update_jdn.sh
=====================================
@@ -215,7 +215,7 @@ case $HOSTNAME in
 esac
 
 # make sure needed directories exists - some directories will not be needed on all hosts...
-for directory in /schroots /srv/reproducible-results /srv/d-i /srv/udebs /srv/live-build /var/log/jenkins/ /srv/jenkins /srv/jenkins/pseudo-hosts /srv/workspace/chroots ; do
+for directory in /schroots /srv/reproducible-results /srv/d-i /srv/udebs /var/log/jenkins/ /srv/jenkins /srv/jenkins/pseudo-hosts /srv/workspace/chroots ; do
 	if [ ! -d $directory ] ; then
 		sudo mkdir $directory
 	fi
@@ -603,7 +603,7 @@ cd $BASEDIR
 shopt -s nullglob
 for f in bin/*.sh bin/**/*.sh ; do bash -n "$f" ; done
 shopt -u nullglob
-for dir in bin logparse live mustache-templates ; do
+for dir in bin logparse mustache-templates ; do
 	sudo mkdir -p /srv/jenkins/$dir
 	sudo rsync -rpt --delete $dir/ /srv/jenkins/$dir/
 	sudo chown -R jenkins-adm.jenkins-adm /srv/jenkins/$dir



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/0f3653967745decef176e5d1691fc13b3cd0d32d

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/0f3653967745decef176e5d1691fc13b3cd0d32d
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20190201/b0063c8b/attachment-0001.html>


More information about the Qa-jenkins-scm mailing list