Merge pull request #1380 from SvenDowideit/select-integration-test-to-run

Select a specific integration test to run

Dockerfile.dapper

@@ -1,15 +1,6 @@
 FROM ubuntu:16.04
 # FROM arm64=aarch64/ubuntu:16.04 arm=armhf/ubuntu:16.04
 
-ENV DAPPER_ENV VERSION DEV_BUILD
-ENV DAPPER_DOCKER_SOCKET true
-ENV DAPPER_SOURCE /go/src/github.com/rancher/os
-ENV DAPPER_OUTPUT ./bin ./dist ./build/initrd
-ENV DAPPER_RUN_ARGS --privileged
-ENV TRASH_CACHE ${DAPPER_SOURCE}/.trash-cache
-ENV SHELL /bin/bash
-WORKDIR ${DAPPER_SOURCE}
-
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
         build-essential \
@@ -38,6 +29,17 @@ RUN apt-get update && \
         wget \
         xorriso
 
+########## Dapper Configuration #####################
+
+ENV DAPPER_ENV VERSION DEV_BUILD RUNTEST
+ENV DAPPER_DOCKER_SOCKET true
+ENV DAPPER_SOURCE /go/src/github.com/rancher/os
+ENV DAPPER_OUTPUT ./bin ./dist ./build/initrd
+ENV DAPPER_RUN_ARGS --privileged
+ENV TRASH_CACHE ${DAPPER_SOURCE}/.trash-cache
+ENV SHELL /bin/bash
+WORKDIR ${DAPPER_SOURCE}
+
 ########## General Configuration #####################
 ARG DAPPER_HOST_ARCH=amd64
 ARG HOST_ARCH=${DAPPER_HOST_ARCH}

docs/os/contributing/index.md

@@ -31,6 +31,12 @@ If you're building a version of RancherOS used for development and not for a rel
 
 Run `make integration-tests` to run the all integration tests in a container, or `./scripts/integration-tests` to run them outside a container (they use QEMU to test the OS.)
 
+To run just one integration test, or a group of them (using regex's like `.*Console.*`, you can set the `RUNTEST` environment variable:
+
+```
+$ RUNTEST=TestPreload make integration-test
+```
+
 ### Running
 
 Prerequisites: QEMU, coreutils, cdrtools/genisoimage/mkisofs.

scripts/integration-test

@@ -14,4 +14,8 @@ if [ ! -e ../dist/artifacts/initrd ]; then
     ../scripts/dev
 fi
 
-go test -timeout 30m
+if [ "$RUNTEST" != "" ]; then
+	RUNTEST="-check.f ${RUNTEST}"
+fi
+
+go test -timeout 9999m $RUNTEST