Merge pull request #754 from cdrage/fix-cluster-tests

Temporarily remove buildconfig tests for OpenShift
This commit is contained in:
Charlie Drage 2017-08-09 10:51:43 -04:00 committed by GitHub
commit 937b15e968
2 changed files with 0 additions and 94 deletions

View File

@ -1,46 +0,0 @@
#!/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.
# Test case for buildconfig on kompose
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 buildconfig on kompose"
docker_compose_file="${KOMPOSE_ROOT}/script/test_in_openshift/compose-files/buildconfig/docker-compose.yml"
# Run kompose up
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
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

View File

@ -1,48 +0,0 @@
#!/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.
# Test case for buildconfig on kompose
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 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::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::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