diff --git a/.travis.yml b/.travis.yml index 61a3a87..fbb41ab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,11 +4,11 @@ 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 + - travis_wait 35 $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 - ls -l ~/qubes-builder/iso env: - - DIST_DOM0=fc25 INSTALLER_KICKSTART=/tmp/qubes-installer/conf/travis-iso.ks USE_QUBES_REPO_VERSION=4.0 + - DIST_DOM0=fc25 INSTALLER_KICKSTART=/tmp/qubes-installer/conf/travis-iso-full.ks USE_QUBES_REPO_VERSION=4.0 RPM_BUILD_DEFINES=--nocheck - DIST_DOM0=fc25 INSTALLER_KICKSTART=/tmp/qubes-installer/conf/travis-iso-unsigned.ks USE_QUBES_REPO_VERSION=4.0 EXPECT_FAILURE=./expected-failure - DIST_DOM0=fc25 INSTALLER_KICKSTART=/tmp/qubes-installer/conf/travis-iso-unknown-key.ks USE_QUBES_REPO_VERSION=4.0 EXPECT_FAILURE=./expected-failure diff --git a/conf/travis-iso-full.ks b/conf/travis-iso-full.ks new file mode 100644 index 0000000..cd027b0 --- /dev/null +++ b/conf/travis-iso-full.ks @@ -0,0 +1,6 @@ +%include qubes-kickstart.cfg + +repo --name=qubes-r4.0-testing --gpgkey=file:///tmp/qubes-installer/qubes-release/RPM-GPG-KEY-qubes-4.0-primary --baseurl=http://mirrors.ukfast.co.uk/sites/qubes-os.org/repo/yum/r4.0/current-testing/dom0/fc25 --ignoregroups=true +repo --name=qubes-r4.0-templates-itl --gpgkey=file:///tmp/qubes-installer/qubes-release/RPM-GPG-KEY-qubes-4.0-primary --baseurl=http://mirrors.ukfast.co.uk/sites/qubes-os.org/repo/yum/r4.0/templates-itl --ignoregroups=true +repo --name=qubes-r4.0-templates-community --gpgkey=file:///tmp/qubes-installer/qubes-release/RPM-GPG-KEY-qubes-4.0-templates-community --baseurl=http://mirrors.ukfast.co.uk/sites/qubes-os.org/repo/yum/r4.0/templates-community --ignoregroups=true + diff --git a/conf/travis-iso-unknown-key.ks b/conf/travis-iso-unknown-key.ks index bc9dee6..9e94b5e 100644 --- a/conf/travis-iso-unknown-key.ks +++ b/conf/travis-iso-unknown-key.ks @@ -1,3 +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 +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 --ignoregroups=true diff --git a/conf/travis-iso-unsigned.ks b/conf/travis-iso-unsigned.ks index b39a451..1b73797 100644 --- a/conf/travis-iso-unsigned.ks +++ b/conf/travis-iso-unsigned.ks @@ -1,3 +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 +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 --ignoregroups=true diff --git a/conf/travis-iso.ks b/conf/travis-iso.ks index 0fab1e8..3de03d6 100644 --- a/conf/travis-iso.ks +++ b/conf/travis-iso.ks @@ -1,3 +1,3 @@ %include qubes-kickstart.cfg -repo --name=qubes-r4.0-testing --gpgkey=file:///tmp/qubes-installer/qubes-release/RPM-GPG-KEY-qubes-4.0-primary --baseurl=http://yum.qubes-os.org/r4.0/current-testing/dom0/fc25 +repo --name=qubes-r4.0-testing --gpgkey=file:///tmp/qubes-installer/qubes-release/RPM-GPG-KEY-qubes-4.0-primary --baseurl=http://yum.qubes-os.org/r4.0/current-testing/dom0/fc25 --ignoregroups=true