Pull changes from upstream for version 2.6

created from upstream commit: 2f676852fab45caf07c5958cf4b7fa6ffc2498d1

test/test-lib-ruby.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+#
+# Functions for tests for the Ruby S2I 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]})
+
+source ${THISDIR}/test-lib.sh
+source ${THISDIR}/test-lib-openshift.sh
+
+function test_ruby_integration() {
+  local image_name=$1
+  local version=$2
+  local import_image=${3:-}
+  VERSION=$version ct_os_test_s2i_app "${image_name}" \
+                                      "https://github.com/sclorg/s2i-ruby-container.git" \
+                                      ${version}/test/puma-test-app \
+                                      ".*" \
+                                      8080 http 200 "" \
+                                      "${import_image}"
+}
+