From 68ab062cde13a8a0740a5916d3c3f248a22d89c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Tue, 24 May 2016 13:40:53 +0200 Subject: [PATCH 1/4] Make build configuration (kickstart) configurable QubesOS/qubes-issues#1926 --- Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 3feb1cf..826dd32 100644 --- a/Makefile +++ b/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 From ff0bb730bb4c6be28590f1f4fe6a722bac626b10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Tue, 24 May 2016 13:49:21 +0200 Subject: [PATCH 2/4] travis: add basic build test QubesOS/qubes-issues#1926 --- .travis.yml | 11 +++++++++++ conf/travis-iso.ks | 3 +++ 2 files changed, 14 insertions(+) create mode 100644 .travis.yml create mode 100644 conf/travis-iso.ks diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..ff0a4d5 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,11 @@ +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 make -C ~/qubes-builder iso BUILDERCONF=scripts/travis-builder.conf VERBOSE=0 COMPONENTS=installer-qubes-os +after_script: + - tail -n 1000 ~/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 diff --git a/conf/travis-iso.ks b/conf/travis-iso.ks new file mode 100644 index 0000000..3bee733 --- /dev/null +++ b/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 From 798e008f7b3a53763f355755719ff2b1d4b9ca4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Wed, 25 May 2016 01:47:16 +0200 Subject: [PATCH 3/4] travis: Smaller output log There is 4MB limit on total log size... QubesOS/qubes-issues#1926 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ff0a4d5..a700dbd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,6 @@ script: - ~/qubes-builder/scripts/travis-build - travis_wait 30 make -C ~/qubes-builder iso BUILDERCONF=scripts/travis-builder.conf VERBOSE=0 COMPONENTS=installer-qubes-os after_script: - - tail -n 1000 ~/qubes-builder/build-logs/installer-qubes-os-iso-*.log + - 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 From 237aee86c5fa093039aacccb9cabc171d971a925 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Wed, 25 May 2016 01:47:56 +0200 Subject: [PATCH 4/4] travis: check if package verification really works QubesOS/qubes-issues#1926 --- .travis.yml | 6 ++++-- conf/travis-iso-unknown-key.ks | 3 +++ conf/travis-iso-unsigned.ks | 3 +++ expected-failure | 3 +++ 4 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 conf/travis-iso-unknown-key.ks create mode 100644 conf/travis-iso-unsigned.ks create mode 100755 expected-failure diff --git a/.travis.yml b/.travis.yml index a700dbd..8be15c8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,8 +4,10 @@ language: generic install: git clone https://github.com/QubesOS/qubes-builder ~/qubes-builder script: - ~/qubes-builder/scripts/travis-build - - travis_wait 30 make -C ~/qubes-builder iso BUILDERCONF=scripts/travis-builder.conf VERBOSE=0 COMPONENTS=installer-qubes-os + - 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.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 diff --git a/conf/travis-iso-unknown-key.ks b/conf/travis-iso-unknown-key.ks new file mode 100644 index 0000000..bc9dee6 --- /dev/null +++ b/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 diff --git a/conf/travis-iso-unsigned.ks b/conf/travis-iso-unsigned.ks new file mode 100644 index 0000000..b39a451 --- /dev/null +++ b/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 diff --git a/expected-failure b/expected-failure new file mode 100755 index 0000000..18e97e4 --- /dev/null +++ b/expected-failure @@ -0,0 +1,3 @@ +#!/bin/sh + +! "$@"