Use matrix keyword to simplify travis-ci build definitions.

Also eliminate unnecessary heartbeat function.
This commit is contained in:
Chris PeBenito 2015-02-23 09:24:28 -05:00
parent 9a215ef9d9
commit 894a1f104d

View File

@ -5,24 +5,17 @@ python:
- "2.7"
env:
- TYPE=standard DISTRO=redhat DIRECT_INITRC=y MONOLITHIC=y
- TYPE=standard DISTRO=redhat DIRECT_INITRC=y MONOLITHIC=n
- TYPE=standard DISTRO=debian DIRECT_INITRC=y MONOLITHIC=y
- TYPE=standard DISTRO=debian DIRECT_INITRC=y MONOLITHIC=n
- TYPE=standard DISTRO=gentoo DIRECT_INITRC=y MONOLITHIC=y
- TYPE=standard DISTRO=gentoo DIRECT_INITRC=y MONOLITHIC=n
- TYPE=mcs DISTRO=redhat DIRECT_INITRC=y MONOLITHIC=y
- TYPE=mcs DISTRO=redhat DIRECT_INITRC=y MONOLITHIC=n
- TYPE=mcs DISTRO=debian DIRECT_INITRC=y MONOLITHIC=y
- TYPE=mcs DISTRO=debian DIRECT_INITRC=y MONOLITHIC=n
- TYPE=mcs DISTRO=gentoo DIRECT_INITRC=y MONOLITHIC=y
- TYPE=mcs DISTRO=gentoo DIRECT_INITRC=y MONOLITHIC=n
- TYPE=mls DISTRO=redhat DIRECT_INITRC=y MONOLITHIC=y
- TYPE=mls DISTRO=redhat DIRECT_INITRC=y MONOLITHIC=n
- TYPE=mls DISTRO=debian DIRECT_INITRC=y MONOLITHIC=y
- TYPE=mls DISTRO=debian DIRECT_INITRC=y MONOLITHIC=n
- TYPE=mls DISTRO=gentoo DIRECT_INITRC=y MONOLITHIC=y
- TYPE=mls DISTRO=gentoo DIRECT_INITRC=y MONOLITHIC=n
global:
- TYPE=standard MONILITHIC=y DIRECT_INITRC=y
- TYPE=standard MONILITHIC=n DIRECT_INITRC=y
- TYPE=mcs MONILITHIC=y DIRECT_INITRC=y
- TYPE=mcs MONILITHIC=n DIRECT_INITRC=y
- TYPE=mls MONILITHIC=y DIRECT_INITRC=y
- TYPE=mls MONILITHIC=n DIRECT_INITRC=y
matrix:
- DISTRO=redhat
- DISTRO=debian
- DISTRO=gentoo
# Install SELinux userspace utilities dependencies
before_install:
@ -69,11 +62,9 @@ install:
# Drop build.conf settings to listen to env vars
- sed -r -i -e '/(DIRECT_INITRC|MONOLITHIC|TYPE|DISTRO)/d' build.conf
# Use a heartbeat loop to produce output while compiling the policy, which takes a quite long time.
script:
- echo $TYPE $DISTRO $DIRECT_INITRC $MONOLITHIC
- make bare
- make conf
- ( for A in $(seq 8) ; do sleep 300 ; echo "Heartbeat $((A*5)) minutes" ; done ) &
- make
- make validate