diff --git a/script/test_in_openshift/compose-files/v3-docker-compose-restart-always.yml b/script/test_in_openshift/compose-files/v3-docker-compose-restart-always.yml new file mode 100644 index 0000000000..f8d15c86a6 --- /dev/null +++ b/script/test_in_openshift/compose-files/v3-docker-compose-restart-always.yml @@ -0,0 +1,8 @@ +version: '3' + +services: + pival: + image: perl + command: ["perl", "-Mbignum=bpi", "-wle", "print bpi(2000)"] + restart: "always" + \ No newline at end of file diff --git a/script/test_in_openshift/compose-files/v3-docker-compose.yaml b/script/test_in_openshift/compose-files/v3-docker-compose.yaml new file mode 100644 index 0000000000..83dc75e124 --- /dev/null +++ b/script/test_in_openshift/compose-files/v3-docker-compose.yaml @@ -0,0 +1,14 @@ +version: "3" + +services: + web: + image: tuna/docker-counter23 + ports: + - "5000:5000" + links: + - redis + + redis: + image: redis:3.0 + ports: + - "6379" diff --git a/script/test_in_openshift/tests/v3-redis.sh b/script/test_in_openshift/tests/v3-redis.sh new file mode 100755 index 0000000000..f14f29d8bb --- /dev/null +++ b/script/test_in_openshift/tests/v3-redis.sh @@ -0,0 +1,35 @@ +#!/bin/bash + +# Copyright 2017 The Kubernetes Authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + + +KOMPOSE_ROOT=$(readlink -f $(dirname "${BASH_SOURCE}")/../../..) +source $KOMPOSE_ROOT/script/test/cmd/lib.sh +source $KOMPOSE_ROOT/script/test_in_openshift/lib.sh + +convert::print_msg "Running tests for docker compose v3" + +docker_compose_file="${KOMPOSE_ROOT}/script/test_in_openshift/compose-files/v3-docker-compose.yaml" + +# Run kompose up +convert::kompose_up $docker_compose_file + +# Check if redis and web pods are up. Replica count: 2 +convert::kompose_up_check -p "redis web" + +# Run Kompose down +convert::kompose_down $docker_compose_file + +convert::kompose_down_check 2 diff --git a/script/test_in_openshift/tests/v3-restart.sh b/script/test_in_openshift/tests/v3-restart.sh new file mode 100755 index 0000000000..0c0a8375fa --- /dev/null +++ b/script/test_in_openshift/tests/v3-restart.sh @@ -0,0 +1,50 @@ +#!/bin/bash + +# Copyright 2017 The Kubernetes Authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + + +KOMPOSE_ROOT=$(readlink -f $(dirname "${BASH_SOURCE}")/../../..) +source $KOMPOSE_ROOT/script/test/cmd/lib.sh +source $KOMPOSE_ROOT/script/test_in_openshift/lib.sh + +convert::print_msg "Testing restart: 'always' in v3 docker-compose file" + +docker_compose_file="${KOMPOSE_ROOT}/script/test_in_openshift/compose-files/v3-docker-compose-restart-always.yml" + +# Run kompose up +convert::kompose_up $docker_compose_file + +# Check if the pods are up +retry_up=0 + +while [ $(oc get pods --no-headers | wc -l ) -ne 1 ] || + [ $(oc get pods --no-headers | awk '{ print $4 }') -eq 0 ]; do + if [ $retry_up -lt 240 ]; then + retry_up=$(($retry_up + 1)) + sleep 1 + else + exit 1 + fi +done + +if [ $(oc get pods --no-headers | awk '{ print $4 }') > 0 ]; then + convert::print_pass "restart option set to 'always' is working as expected\n" + oc get pods +fi + +# Run Kompose down +convert::kompose_down $docker_compose_file + +convert::kompose_down_check 1