QubesOS/qubes-installer-qubes-os
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into fedora-23

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2016-05-25 03:10:11 +02:00
commit 4288335086
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
6 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
.travis.yml Normal file
View File

@ -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

7
Makefile
View File

@ -31,6 +31,9 @@ else
endif endif
PUNGI_OPTS += --ver="$(ISO_VERSION)" PUNGI_OPTS += --ver="$(ISO_VERSION)"
INSTALLER_KICKSTART ?= $(PWD)/conf/qubes-kickstart.cfg
LIVE_KICKSTART ?= $(PWD)/conf/liveusb.ks
help: help:
@echo "make iso <== \o/";\ @echo "make iso <== \o/";\
echo; \ echo; \
@ -53,7 +56,7 @@ iso-prepare:
iso-installer: iso-prepare iso-installer: iso-prepare
mkdir -p work 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 # Move result files to known-named directories
mkdir -p build/ISO/qubes-x86_64/iso build/work 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/ 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 chown --reference=Makefile -R build yum
rm -rf work rm -rf work
iso-liveusb: conf/liveusb.ks iso-prepare iso-liveusb: $(LIVE_KICKSTART) iso-prepare
mkdir -p work 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 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 # Move result files to known-named directories

3
conf/travis-iso-unknown-key.ks Normal file
View File

@ -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

3
conf/travis-iso-unsigned.ks Normal file
View File

@ -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

3
conf/travis-iso.ks Normal file
View File

@ -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

3
expected-failure Executable file
View File

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