Skip to content

Conversation

@adambkaplan
Copy link
Contributor

Update tests to use ruby-25 image.

/assign @bparees
fyi @openshift/openshift-team-developer-experience

@openshift-ci-robot openshift-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Nov 6, 2019
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 6, 2019
@adambkaplan
Copy link
Contributor Author

Looks like there were a few tests that were not disabled in the ruby:2.2 deprecation.

@bparees
Copy link
Contributor

bparees commented Nov 6, 2019

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Nov 6, 2019
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

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

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

The pull request process is described here

Details 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

@bparees
Copy link
Contributor

bparees commented Nov 6, 2019

/retest

@adambkaplan
Copy link
Contributor Author

/hold

cmd fails because the pod it runs in does not have git installed :/

@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 Nov 6, 2019
Update tests to use ruby-25 image.
@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Nov 6, 2019
@openshift-ci-robot
Copy link

New changes are detected. LGTM label has been removed.

@adambkaplan
Copy link
Contributor Author

/hold cancel

@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 Nov 6, 2019
@adambkaplan adambkaplan added the lgtm Indicates that a PR is ready to be merged. label Nov 7, 2019
@adambkaplan
Copy link
Contributor Author

self-tagging

@adambkaplan
Copy link
Contributor Author

/retest

@adambkaplan
Copy link
Contributor Author

/cherrypick release-4.2

@adambkaplan
Copy link
Contributor Author

/cherrypick release-4.1

@openshift-cherrypick-robot

@adambkaplan: new pull request created: #24109

Details

In response to this:

/cherrypick release-4.2

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.

@openshift-cherrypick-robot

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

Using index info to reconstruct a base tree...
M	test/extended/builds/pipeline_origin_bld.go
M	test/extended/builds/start.go
M	test/extended/testdata/bindata.go
A	test/extended/testdata/cmd/test/cmd/admin.sh
A	test/extended/testdata/cmd/test/cmd/builds.sh
A	test/extended/testdata/cmd/test/cmd/newapp.sh
A	test/extended/testdata/cmd/test/cmd/templates.sh
A	test/extended/testdata/cmd/test/cmd/testdata/app-scenarios/new-project-deployed-app.yaml
A	test/extended/testdata/cmd/test/cmd/testdata/app-scenarios/new-project-no-build.yaml
A	test/extended/testdata/cmd/test/cmd/testdata/app-scenarios/new-project-one-build.yaml
A	test/extended/testdata/cmd/test/cmd/testdata/app-scenarios/new-project-two-deployment-configs.yaml
A	test/extended/testdata/cmd/test/cmd/testdata/application-template-dockerbuild.json
A	test/extended/testdata/cmd/test/cmd/testdata/application-template-stibuild.json
A	test/extended/testdata/cmd/test/cmd/testdata/new-app/build-arg-dockerfile/Dockerfile
A	test/extended/testdata/cmd/test/cmd/testdata/new-app/template-with-app-label.json
A	test/extended/testdata/cmd/test/cmd/testdata/new-app/template-without-app-label.json
A	test/extended/testdata/cmd/test/cmd/testdata/statefulset.yaml
A	test/extended/testdata/cmd/test/cmd/testdata/test-bc.yaml
A	test/extended/testdata/cmd/test/cmd/testdata/test-buildcli.json
A	test/extended/testdata/cmd/test/cmd/triggers.sh
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): test/extended/testdata/cmd/test/cmd/testdata/new-app/build-arg-dockerfile/Dockerfile deleted in HEAD and modified in React to openshift/ruby-hello-world update. Version React to openshift/ruby-hello-world update of test/extended/testdata/cmd/test/cmd/testdata/new-app/build-arg-dockerfile/Dockerfile left in tree.
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/cmd/triggers.sh
Auto-merging test/cmd/newapp.sh
CONFLICT (content): Merge conflict in test/cmd/newapp.sh
Auto-merging test/cmd/builds.sh
CONFLICT (content): Merge conflict in test/cmd/builds.sh
error: Failed to merge in the changes.
Patch failed at 0001 React to openshift/ruby-hello-world update

Details

In response to this:

/cherrypick 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.

@adambkaplan
Copy link
Contributor Author

/retitle Bug 1769949: React to openshift/ruby-hello-world update

@openshift-ci-robot openshift-ci-robot changed the title React to openshift/ruby-hello-world update Bug 1769949: React to openshift/ruby-hello-world update Nov 7, 2019
@openshift-ci-robot
Copy link

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

Details

In response to this:

Bug 1769949: React to openshift/ruby-hello-world update

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

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

Development

Successfully merging this pull request may close these issues.

5 participants