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.

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

tests: stop pulling php, composer #3566

Merged
merged 1 commit into from
Oct 5, 2021

Conversation

edsantiago
Copy link
Collaborator

php and composer images (400MB and 185MB) were being used
unnecessarily. This sometimes caused flakes due to network
hiccups. Use busybox and libpod/testimage instead. (And,
tighten up the copy-from test).

Also -- oops! -- fix a nonworking expect_output. The
presence of '|' in "blah blah ... <image|stage>"
was causing '=~' to match only 'stage>'. Escape the '|'
in all relevant places, and confirm there are no more.

Fixes: #3494

Signed-off-by: Ed Santiago santiago@redhat.com

php and composer images (400MB and 185MB) were being used
unnecessarily. This sometimes caused flakes due to network
hiccups. Use busybox and libpod/testimage instead. (And,
tighten up the copy-from test).

Also -- oops! -- fix a nonworking expect_output. The
presence of '|' in "blah blah ... <image|stage>"
was causing '=~' to match only 'stage>'. Escape the '|'
in all relevant places, and confirm there are no more.

Fixes: containers#3494

Signed-off-by: Ed Santiago <santiago@redhat.com>
@rhatdan
Copy link
Member

rhatdan commented Oct 4, 2021

LGTM

@TomSweeneyRedHat
Copy link
Member

From the aspect of image diversity in our tests, I'd rather keep PHP and composer, but since it's causing issues, I'll withdraw my objections.
LGTM

@TomSweeneyRedHat
Copy link
Member

/lgtm

@rhatdan
Copy link
Member

rhatdan commented Oct 5, 2021

/approve

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 5, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: edsantiago, rhatdan

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved label Oct 5, 2021
@openshift-merge-robot openshift-merge-robot merged commit fa984d1 into containers:main Oct 5, 2021
@edsantiago edsantiago deleted the smaller_images branch October 5, 2021 13:53
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 15, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Optimization: use smaller images in tests
5 participants