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

Jump to bottom

"Bug 1754186: Move extended build tests from ruby:2.x to ruby:2.5" #23452

Merged
merged 1 commit into from Jul 24, 2019
Merged

"Bug 1754186: Move extended build tests from ruby:2.x to ruby:2.5" #23452

merged 1 commit into from Jul 24, 2019

Conversation

adambkaplan
Copy link
Contributor

@adambkaplan adambkaplan commented Jul 22, 2019 •
edited

Unblocks e2e-aws-builds - the ruby:2.2 imagestreamtag was removed in openshift/cluster-samples-operator#158

@openshift-ci-robot openshift-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Jul 22, 2019
@adambkaplan
Copy link
Contributor Author

/retest

@adambkaplan
Copy link
Contributor Author

/retest

DNS for origin was pruned :/

@deads2k
Copy link
Contributor

deads2k commented Jul 23, 2019

/hold

these files moving/moved in #23453

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 23, 2019
@deads2k deads2k mentioned this pull request Jul 23, 2019
Merged
@adambkaplan adambkaplan mentioned this pull request Jul 23, 2019
Merged
@openshift-ci-robot openshift-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Jul 23, 2019
@adambkaplan adambkaplan changed the title WIP - fix build e2es that use ruby 2.2 Move extended build tests from ruby:2.x to ruby:2.5 Jul 23, 2019
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 23, 2019
@adambkaplan
Copy link
Contributor Author

/hold cancel

/assign @deads2k

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 23, 2019
@adambkaplan
Copy link
Contributor Author

/cc @gabemontero @coreydaley @ricardomaraschini

@gabemontero
Copy link
Contributor

/approve
/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jul 23, 2019
@adambkaplan
Copy link
Contributor Author

/assign @bparees

@bparees
Copy link
Contributor

bparees commented Jul 23, 2019

/approve

@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: adambkaplan, bparees, gabemontero

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-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 23, 2019
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit ac77c8a into openshift:master Jul 24, 2019
@gabemontero gabemontero mentioned this pull request Jul 25, 2019
Merged
@adambkaplan
Copy link
Contributor Author

/cherry-pick release-4.1

@adambkaplan adambkaplan deleted the build-e2e-ruby-fix branch September 10, 2019 19:41
@openshift-cherrypick-robot
Copy link

@adambkaplan: #23452 failed to apply on top of branch "release-4.1":

Using index info to reconstruct a base tree...
M	examples/sample-app/README.md
M	test/extended/builds/cluster_config.go
M	test/extended/builds/image_source.go
M	test/extended/builds/pipeline_origin_bld.go
M	test/extended/builds/start.go
M	test/extended/testdata/bindata.go
M	test/extended/testdata/builds/test-build.yaml
A	test/extended/testdata/cluster/quickstarts/rails-postgresql.json
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): test/extended/testdata/cluster/quickstarts/rails-postgresql.json deleted in HEAD and modified in Move extended build tests from ruby:2.x to ruby:2.5. Version Move extended build tests from ruby:2.x to ruby:2.5 of test/extended/testdata/cluster/quickstarts/rails-postgresql.json left in tree.
Auto-merging test/extended/testdata/builds/test-build.yaml
CONFLICT (content): Merge conflict in test/extended/testdata/builds/test-build.yaml
Auto-merging test/extended/testdata/bindata.go
CONFLICT (content): Merge conflict in test/extended/testdata/bindata.go
Auto-merging test/extended/builds/start.go
Auto-merging test/extended/builds/pipeline_origin_bld.go
Auto-merging test/extended/builds/image_source.go
Auto-merging test/extended/builds/cluster_config.go
Auto-merging examples/sample-app/README.md
error: Failed to merge in the changes.
Patch failed at 0001 Move extended build tests from ruby:2.x to ruby:2.5

In response to this:

/cherry-pick release-4.1

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@gabemontero gabemontero mentioned this pull request Sep 13, 2019
Merged
@gabemontero
Copy link
Contributor

/retitle "Bug 1754186: Move extended build tests from ruby:2.x to ruby:2.5"

@openshift-ci-robot openshift-ci-robot changed the title Move extended build tests from ruby:2.x to ruby:2.5 "Bug 1754186: Move extended build tests from ruby:2.x to ruby:2.5" Sep 21, 2019
@openshift-ci-robot
Copy link

@adambkaplan: All pull requests linked via external trackers have merged. Bugzilla bug 1754186 has been moved to the MODIFIED state.

In response to this:

"Bug 1754186: Move extended build tests from ruby:2.x to ruby:2.5"

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bparees bparees Awaiting requested review from bparees

@enj enj Awaiting requested review from enj

@coreydaley coreydaley Awaiting requested review from coreydaley

@gabemontero gabemontero Awaiting requested review from gabemontero

@ricardomaraschini ricardomaraschini Awaiting requested review from ricardomaraschini

Assignees

@gabemontero gabemontero

@bparees bparees

@deads2k deads2k

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@adambkaplan @deads2k @gabemontero @bparees @openshift-ci-robot @openshift-bot @openshift-cherrypick-robot @openshift-merge-robot