From de5cdfa6a219a70d51c5e0bfb698ef4fe1832a5d Mon Sep 17 00:00:00 2001
From: Anush Shetty <ashetty@redhat.com>
Date: Thu, 22 Jun 2017 15:36:39 +0530
Subject: [PATCH] OpenShift Tests for the build and push

This patch fixes the broken buildconfig functional tests
---
 .../buildconfig/build/Dockerfile              |  3 +++
 .../buildconfig/docker-compose.yml            |  6 ++++++
 script/test_in_openshift/lib.sh               |  1 -
 script/test_in_openshift/tests/buildconfig.sh | 19 +++++++++++++++----
 .../tests/buildconfig_dockerfile.sh           | 17 +++++++++++++++--
 5 files changed, 39 insertions(+), 7 deletions(-)
 create mode 100644 script/test_in_openshift/compose-files/buildconfig/build/Dockerfile
 create mode 100644 script/test_in_openshift/compose-files/buildconfig/docker-compose.yml

diff --git a/script/test_in_openshift/compose-files/buildconfig/build/Dockerfile b/script/test_in_openshift/compose-files/buildconfig/build/Dockerfile
new file mode 100644
index 00000000..393b5b75
--- /dev/null
+++ b/script/test_in_openshift/compose-files/buildconfig/build/Dockerfile
@@ -0,0 +1,3 @@
+FROM busybox:1.26.2
+
+RUN touch /test
diff --git a/script/test_in_openshift/compose-files/buildconfig/docker-compose.yml b/script/test_in_openshift/compose-files/buildconfig/docker-compose.yml
new file mode 100644
index 00000000..9b5e0088
--- /dev/null
+++ b/script/test_in_openshift/compose-files/buildconfig/docker-compose.yml
@@ -0,0 +1,6 @@
+version: "2"
+
+services:
+ foo:
+  build: "./build"
+  command: sleep 100
\ No newline at end of file
diff --git a/script/test_in_openshift/lib.sh b/script/test_in_openshift/lib.sh
index 6b09e675..4be0cdb0 100644
--- a/script/test_in_openshift/lib.sh
+++ b/script/test_in_openshift/lib.sh
@@ -201,7 +201,6 @@ function convert::kompose_up () {
     fi
 }
 
-
 function convert::kompose_down () {
     # Function for running 'kompose down'
     # Usage: convert::kompose_down <docker_compose_file>
diff --git a/script/test_in_openshift/tests/buildconfig.sh b/script/test_in_openshift/tests/buildconfig.sh
index b493f170..343230b5 100755
--- a/script/test_in_openshift/tests/buildconfig.sh
+++ b/script/test_in_openshift/tests/buildconfig.sh
@@ -21,15 +21,26 @@ source $KOMPOSE_ROOT/script/test_in_openshift/lib.sh
 
 convert::print_msg "Testing buildconfig on kompose"
 
-docker_compose_file="${KOMPOSE_ROOT}/examples/buildconfig/docker-compose.yml"
+docker_compose_file="${KOMPOSE_ROOT}/script/test_in_openshift/compose-files/buildconfig/docker-compose.yml"
 
 # Run kompose up
-convert::kompose_up $docker_compose_file
+convert::print_msg "Running kompose up ..."
+kompose up --provider=openshift --emptyvols -f $docker_compose_file --build build-config; exit_status=$?
+
+if [ $exit_status -ne 0 ]; then
+    convert::print_fail "kompose up has failed\n"
+    exit 1
+fi
 
 # Check if the pods are up.
 convert::kompose_up_check -p foo
 
-# Kompose down for buildconfig fails being tracked at #382
-convert::kompose_down $docker_compose_file
+convert::print_msg "Running kompose down ..."
+kompose down --provider=openshift -f $docker_compose_file; exit_status=$?
+
+if [ $exit_status -ne 0 ]; then
+    convert::print_fail "kompose down has failed\n"
+    exit 1
+fi
 
 convert::kompose_down_check 2
diff --git a/script/test_in_openshift/tests/buildconfig_dockerfile.sh b/script/test_in_openshift/tests/buildconfig_dockerfile.sh
index da1ace2a..c19a0599 100755
--- a/script/test_in_openshift/tests/buildconfig_dockerfile.sh
+++ b/script/test_in_openshift/tests/buildconfig_dockerfile.sh
@@ -24,12 +24,25 @@ convert::print_msg "Testing buildconfig dockerfile construct in kompose"
 docker_compose_file="${KOMPOSE_ROOT}/script/test_in_openshift/compose-files/docker-compose-bc-dockerfile.yml"
 
 # Run kompose up
-convert::kompose_up $docker_compose_file
+convert::print_msg "Running kompose up ..."
+kompose up --provider=openshift --emptyvols -f $docker_compose_file --build build-config; exit_status=$?
+
+if [ $exit_status -ne 0 ]; then
+    convert::print_fail "kompose up has failed\n"
+    exit 1
+fi
 
 # Check if the pods are up.
 convert::kompose_up_check -p foo
 
 # Kompose down for buildconfig fails being tracked at #382
-# convert::kompose_down $docker_compose_file
+convert::print_msg "Running kompose down ..."
+kompose down --provider=openshift -f $docker_compose_file; exit_status=$?
+
+if [ $exit_status -ne 0 ]; then
+    convert::print_fail "kompose down has failed\n"
+    exit 1
+fi
+
 
 # convert::kompose_down_check 2