Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support latest imagestreams and httpd ex repo #195

Merged
merged 2 commits into from
Nov 21, 2023
+18 −8
Merged

Support latest imagestreams and httpd ex repo #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d57c896
Move test_latest_imagestreams from run-openshift-local-cluster to tes…
phracek Nov 15, 2023
e0f39a9
This change is mandatory for testing test_latest_imagestreams.
phracek Nov 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Variables are documented in common/build.sh.
BASE_IMAGE_NAME = httpd
VERSIONS = 2.4 2.4-micro
VERSIONS = 2.4-micro 2.4
zmiklank marked this conversation as resolved.
Show resolved Hide resolved
OPENSHIFT_NAMESPACES =
DOCKER_BUILD_CONTEXT = ..

Expand Down
7 changes: 0 additions & 7 deletions test/run-openshift-local-cluster
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,6 @@ set -eo nounset

trap ct_os_cleanup EXIT SIGINT

function test_latest_imagestreams() {
# Switch to root directory of a container
pushd ${test_dir}/../.. >/dev/null
ct_check_latest_imagestreams
popd >/dev/null
}

ct_os_check_compulsory_vars

ct_os_enable_print_logs
Expand Down
2 changes: 2 additions & 0 deletions test/run-openshift-remote-cluster
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ source ${THISDIR}/test-lib-remote-openshift.sh
TEST_LIST="\
test_httpd_integration
test_httpd_imagestream
test_httpd_example_repo
test_latest_imagestreams
"

trap ct_os_cleanup EXIT SIGINT
Expand Down
15 changes: 15 additions & 0 deletions test/test-lib-httpd.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,19 @@ function test_httpd_imagestream() {
"This is a sample s2i application with static content"
}

function test_httpd_example_repo {
BRANCH_TO_TEST=master
# test remote example app
ct_os_test_s2i_app "${IMAGE_NAME}" "https://github.com/sclorg/httpd-ex#${BRANCH_TO_TEST}" \
"." \
'Welcome to your static httpd application on OpenShift'
}

function test_latest_imagestreams() {
# Switch to root directory of a container
pushd ${THISDIR}/../.. >/dev/null
ct_check_latest_imagestreams
popd >/dev/null
}

# vim: set tabstop=2:shiftwidth=2:expandtab: