From 03237e91b60e1a4c55aec2c3f2ab313eda5f13b4 Mon Sep 17 00:00:00 2001
From: Andrew Schwartzmeyer <andschwa@microsoft.com>
Date: Fri, 9 Sep 2016 14:24:24 -0700
Subject: [PATCH] Consolidate test script with launch script

---
 docker/launch.sh | 26 +++++++++++++++++++-------
 docker/test.sh   | 19 -------------------
 2 files changed, 19 insertions(+), 26 deletions(-)
 delete mode 100644 docker/test.sh

diff --git a/docker/launch.sh b/docker/launch.sh
index 49ada09779..00558cc644 100755
--- a/docker/launch.sh
+++ b/docker/launch.sh
@@ -24,14 +24,26 @@ for build in $BUILDS; do
     # cd so $distro is only the distro name
     cd $build
     for distro in $DISTROS; do
-        echo "Building $build/$distro"
-        # copy the common script because it lives outside the docker build context
-        if [[ "$build" = "unstable" ]]; then
-            cp bootstrap.ps1 $distro
-            buildargs="--build-arg fork=$FORK --build-arg branch=$BRANCH"
+        image="$build/$distro"
+        if [[ "$TEST" -eq 1 ]]; then
+            echo "Testing $image"
+            command="cd PowerShell; Import-Module ./build.psm1; Install-Dotnet -NoSudo; Start-PSPester"
+            # clone repo for stable images because it's not already done
+            if [[ "$build" = stable ]]; then
+                command="git clone --recursive https://github.com/$FORK/PowerShell -b $BRANCH; $command"
+            fi
+            # run Pester tests inside container
+            docker run --rm -it powershell/powershell:$build-$distro powershell -c "$command"
+        else
+            echo "Building $image"
+            # copy the common script because it lives outside the docker build context
+            if [[ "$build" = unstable ]]; then
+                cp bootstrap.ps1 $distro
+                buildargs="--build-arg fork=$FORK --build-arg branch=$BRANCH"
+            fi
+            # build and tag the image so they can be derived from
+            docker build $buildargs -t powershell/powershell:$build-$distro $distro
         fi
-        # build and tag the image so they can be derived from
-        docker build $buildargs -t powershell/powershell:$build-$distro $distro
     done
     cd ..
 done
diff --git a/docker/test.sh b/docker/test.sh
deleted file mode 100644
index fb5d2163c8..0000000000
--- a/docker/test.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-# Build specified distributions
-if [[ -z $DISTROS ]]; then
-    DISTROS="ubuntu14.04 ubuntu16.04 centos7"
-fi
-
-build=unstable
-command="cd PowerShell; Import-Module ./build.psm1; Start-PSPester"
-
-cd $build
-for distro in $DISTROS; do
-    echo "Testing $build/$distro"
-    # Run Pester tests inside container
-    docker run -it powershell/powershell:$build-$distro powershell -c "$command"
-done
-cd ..