diff --git a/.github/workflows/openshift-tests.yml b/.github/workflows/openshift-tests.yml index b7c8c6bc..040a6176 100644 --- a/.github/workflows/openshift-tests.yml +++ b/.github/workflows/openshift-tests.yml @@ -15,12 +15,7 @@ jobs: matrix: version: [ "1.20", "1.22", "1.22-micro" ] os_test: [ "rhel7", "rhel8", "rhel9" ] - test_case: [ "openshift-3", "openshift-4" ] - exclude: - - test_case: "openshift-3" - os_test: "rhel8" - - test_case: "openshift-3" - os_test: "rhel9" + test_case: [ "openshift-4" ] if: | github.event.issue.pull_request diff --git a/1.20/README.md b/1.20/README.md index 33886908..db33f0cd 100644 --- a/1.20/README.md +++ b/1.20/README.md @@ -39,7 +39,7 @@ $ oc exec -- curl 127.0.0.1:8080 Source-to-Image framework and scripts ------------------------------------- -This image supports the [Source-to-Image](https://docs.openshift.com/container-platform/4.4/builds/build-strategies.html#images-create-s2i_build-strategies) +This image supports the [Source-to-Image](https://docs.openshift.com/container-platform/4.14/openshift_images/create-images.html#images-create-s2i_create-images) (S2I) strategy in OpenShift. The Source-to-Image is an OpenShift framework which makes it easy to write images that take application source code as an input, use a builder image like this Nginx container image, and produce diff --git a/1.22-micro/README.md b/1.22-micro/README.md index e8b42280..88f21453 100644 --- a/1.22-micro/README.md +++ b/1.22-micro/README.md @@ -37,7 +37,7 @@ $ oc exec -- curl 127.0.0.1:8080 Source-to-Image framework and scripts ------------------------------------- -This image supports the [Source-to-Image](https://docs.openshift.com/container-platform/4.4/builds/build-strategies.html#images-create-s2i_build-strategies) +This image supports the [Source-to-Image](https://docs.openshift.com/container-platform/4.14/openshift_images/create-images.html#images-create-s2i_create-images) (S2I) strategy in OpenShift. The Source-to-Image is an OpenShift framework which makes it easy to write images that take application source code as an input, use a builder image like this Nginx container image, and produce diff --git a/1.22/README.md b/1.22/README.md index 67695a75..ece7acd2 100644 --- a/1.22/README.md +++ b/1.22/README.md @@ -37,7 +37,7 @@ $ oc exec -- curl 127.0.0.1:8080 Source-to-Image framework and scripts ------------------------------------- -This image supports the [Source-to-Image](https://docs.openshift.com/container-platform/4.4/builds/build-strategies.html#images-create-s2i_build-strategies) +This image supports the [Source-to-Image](https://docs.openshift.com/container-platform/4.14/openshift_images/create-images.html#images-create-s2i_create-images) (S2I) strategy in OpenShift. The Source-to-Image is an OpenShift framework which makes it easy to write images that take application source code as an input, use a builder image like this Nginx container image, and produce diff --git a/1.24/README.md b/1.24/README.md index 9d1fbffb..de178739 100644 --- a/1.24/README.md +++ b/1.24/README.md @@ -38,7 +38,7 @@ $ oc exec -- curl 127.0.0.1:8080 Source-to-Image framework and scripts ------------------------------------- -This image supports the [Source-to-Image](https://docs.openshift.com/container-platform/4.4/builds/build-strategies.html#images-create-s2i_build-strategies) +This image supports the [Source-to-Image](https://docs.openshift.com/container-platform/4.14/openshift_images/create-images.html#images-create-s2i_create-images) (S2I) strategy in OpenShift. The Source-to-Image is an OpenShift framework which makes it easy to write images that take application source code as an input, use a builder image like this Nginx container image, and produce diff --git a/test/run-openshift b/test/run-openshift deleted file mode 120000 index d84575f7..00000000 --- a/test/run-openshift +++ /dev/null @@ -1 +0,0 @@ -run-openshift-local-cluster \ No newline at end of file diff --git a/test/run-openshift-local-cluster b/test/run-openshift-local-cluster deleted file mode 100755 index 2486456a..00000000 --- a/test/run-openshift-local-cluster +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash -# -# Test the Nginx image in OpenShift. -# -# IMAGE_NAME specifies a name of the candidate image used for testing. -# The image has to be available before this script is executed. -# - -THISDIR=$(dirname ${BASH_SOURCE[0]}) -test_dir="$(readlink -f $(dirname ${BASH_SOURCE[0]}))" - -source ${THISDIR}/test-lib.sh -source ${THISDIR}/test-lib-openshift.sh -source ${THISDIR}/test-lib-nginx.sh - -set -eo nounset - -trap ct_os_cleanup EXIT SIGINT - -ct_os_check_compulsory_vars - -ct_os_enable_print_logs - -ct_os_cluster_up - -test_nginx_local_example - -test_nginx_remote_example - -test_nginx_template_from_example_app - -# Check the imagestream -test_nginx_imagestream - -# check if latest imagestream version is correct -test_latest_imagestreams - -OS_TESTSUITE_RESULT=0 - -ct_os_cluster_down - -# vim: set tabstop=2:shiftwidth=2:expandtab: -