Merge branch 'master' into fedora-23

.travis.yml

@@ -0,0 +1,13 @@
+sudo: required
+dist: trusty
+language: generic
+install: git clone https://github.com/QubesOS/qubes-builder ~/qubes-builder
+script: 
+ - ~/qubes-builder/scripts/travis-build
+ - travis_wait 30 $EXPECT_FAILURE make -C ~/qubes-builder iso BUILDERCONF=scripts/travis-builder.conf VERBOSE=0 COMPONENTS=installer-qubes-os
+after_script:
+ - tail -n 100 ~/qubes-builder/build-logs/installer-qubes-os-iso-*.log
+env:
+  - DIST_DOM0=fc20 INSTALLER_KICKSTART=/tmp/qubes-installer/conf/travis-iso.ks USE_QUBES_REPO_VERSION=3.1
+  - DIST_DOM0=fc20 INSTALLER_KICKSTART=/tmp/qubes-installer/conf/travis-iso-unsigned.ks USE_QUBES_REPO_VERSION=3.1 EXPECT_FAILURE=./expected-failure
+  - DIST_DOM0=fc20 INSTALLER_KICKSTART=/tmp/qubes-installer/conf/travis-iso-unknown-key.ks USE_QUBES_REPO_VERSION=3.1 EXPECT_FAILURE=./expected-failure

Makefile

@@ -31,6 +31,9 @@ else
 endif
 PUNGI_OPTS += --ver="$(ISO_VERSION)"
 
+INSTALLER_KICKSTART ?= $(PWD)/conf/qubes-kickstart.cfg
+LIVE_KICKSTART ?= $(PWD)/conf/liveusb.ks
+
 help:
 	@echo "make iso              <== \o/";\
 	    echo; \
@@ -53,7 +56,7 @@ iso-prepare:
 
 iso-installer: iso-prepare
 	mkdir -p work
-	pushd work && pungi --name=Qubes  $(PUNGI_OPTS) -c $(PWD)/conf/qubes-kickstart.cfg && popd
+	pushd work && pungi --name=Qubes  $(PUNGI_OPTS) -c $(INSTALLER_KICKSTART) && popd
 	# Move result files to known-named directories
 	mkdir -p build/ISO/qubes-x86_64/iso build/work
 	mv work/$(ISO_VERSION)/x86_64/iso/*-DVD*.iso build/ISO/qubes-x86_64/iso/
@@ -62,7 +65,7 @@ iso-installer: iso-prepare
 	chown --reference=Makefile -R build yum
 	rm -rf work
 
-iso-liveusb: conf/liveusb.ks iso-prepare
+iso-liveusb: $(LIVE_KICKSTART) iso-prepare
 	mkdir -p work
 	pushd work && ../livecd-creator-qubes --debug --product='Qubes OS' --title="Qubes OS $(ISO_VERSION)" --fslabel="Qubes-$(ISO_VERSION)-x86_64-LIVE" --config ../$< && popd
 	# Move result files to known-named directories

conf/travis-iso-unknown-key.ks

@@ -0,0 +1,3 @@
+%include travis-iso.ks
+
+repo --name=unknown-key --gpgkey=file:///tmp/qubes-installer/qubes-release/RPM-GPG-KEY-qubes-3.1-primary --baseurl=http://ftp.qubes-os.org/~marmarek/repo-verify-unknown-key

conf/travis-iso-unsigned.ks

@@ -0,0 +1,3 @@
+%include travis-iso.ks
+
+repo --name=unsigned --gpgkey=file:///tmp/qubes-installer/qubes-release/RPM-GPG-KEY-qubes-3.1-primary --baseurl=http://ftp.qubes-os.org/~marmarek/repo-verify-unsigned

conf/travis-iso.ks

@@ -0,0 +1,3 @@
+%include qubes-kickstart.cfg
+
+repo --name=qubes-r3.1-testing --gpgkey=file:///tmp/qubes-installer/qubes-release/RPM-GPG-KEY-qubes-3.1-primary --baseurl=http://yum.qubes-os.org/r3.1/current-testing/dom0/fc20

expected-failure

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+! "$@"