container/python3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update from upstream github repository

Browse source
This commit is contained in:
Lumir Balhar 2020-04-03 14:35:44 +02:00
commit b13032933e
6 changed files with 19 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/django-test-app/requirements.txt
View file

@ -1 +1 @@
Django==1.11.23
Django==1.11.28

21
test/test-lib-openshift.sh
View file

@ -290,8 +290,7 @@ function ct_os_new_project() {
oc create -f "$OPENSHIFT_CLUSTER_PULLSECRET_PATH"
# add registry pullsecret to the serviceaccount if provided
secret_name=$(grep '^\s*name:' "$OPENSHIFT_CLUSTER_PULLSECRET_PATH" | awk '{ print $2 }')
secret_json='{"imagePullSecrets": [{"name": "'${secret_name}'"}]}'
oc patch serviceaccount default -p "$secret_json"
oc secrets link --for=pull default "$secret_name"
fi
}
@ -597,15 +596,14 @@ function ct_os_test_s2i_app_func() {
if [ "${CT_SKIP_UPLOAD_IMAGE:-false}" == 'true' ] ; then
if [ -n "${import_image}" ] ; then
echo "Importing image ${import_image} as ${image_name}:${VERSION}"
oc import-image "${image_name}":"${VERSION}" --from "${import_image}" --confirm
# Use --reference-policy=local to pull remote image content to the cluster
# Works around the issue of builder pods not having access to registry.redhat.io
oc import-image "${image_name}":"${VERSION}" --from "${import_image}" --confirm --reference-policy=local
else
echo "Uploading and importing image skipped."
fi
else
if [ -n "${import_image}" ] ; then
echo "Warning: Import image ${import_image} requested, but uploading image ${image_name} instead."
fi
ct_os_upload_image "${image_name}" "${image_tagged}"
ct_os_upload_image "${import_image:-$image_name}" "${image_tagged}"
fi
local app_param="${app}"
@ -728,15 +726,14 @@ function ct_os_test_template_app_func() {
if [ "${CT_SKIP_UPLOAD_IMAGE:-false}" == 'true' ] ; then
if [ -n "${import_image}" ] ; then
echo "Importing image ${import_image} as ${image_name}:${VERSION}"
oc import-image "${image_name}":"${VERSION}" --from "${import_image}" --confirm
# Use --reference-policy=local to pull remote image content to the cluster
# Works around the issue of builder pods not having access to registry.redhat.io
oc import-image "${image_name}":"${VERSION}" --from "${import_image}" --confirm --reference-policy=local
else
echo "Uploading and importing image skipped."
fi
else
if [ -n "${import_image}" ] ; then
echo "Warning: Import image ${import_image} requested, but uploading image ${image_name} instead."
fi
ct_os_upload_image "${image_name}" "${image_tagged}"
ct_os_upload_image "${import_image:-$image_name}" "${image_tagged}"
# upload also other images, that template might need (list of pairs in the format <image>|<tag>
local image_tag_a

2
test/test-lib.sh
View file

@ -254,7 +254,7 @@ function ct_npm_works() {
local tmpdir
tmpdir=$(mktemp -d)
: " Testing npm in the container image"
cid_file="${tmpdir}/cid"
local cid_file="${tmpdir}/cid"
if ! docker run --rm "${IMAGE_NAME}" /bin/bash -c "npm --version" >"${tmpdir}/version" ; then
echo "ERROR: 'npm --version' does not work inside the image ${IMAGE_NAME}." >&2
return 1