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

Lock down everything in branch to this release #767

Merged
merged 1 commit into from Feb 16, 2018

Conversation

djzager
Copy link
Member

@djzager djzager commented Feb 15, 2018

Make it so things in the release-1.0 branch use release-1.0 images + packages + etc.

@djzager djzager added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 15, 2018
@openshift-ci-robot openshift-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. labels Feb 15, 2018
@djzager
Copy link
Member Author

djzager commented Feb 15, 2018

I'm still trying to figure out how to make the Dockerfile-latest in this branch build using the 1.0 ansible-service-broker from copr. Maybe @jmontleon knows how to do that sorcery.

Thinking more about that...that's dumb, we can just use the canary image on release-1.0/release-1.1 branch for the broker images.

Copy link
Contributor

@shawn-hurley shawn-hurley left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@@ -418,7 +418,7 @@ parameters:
- description: Container Image to use for Ansible Service Broker in format of imagename:tag
displayname: Ansible Service Broker Image
name: BROKER_IMAGE
value: ansibleplaybookbundle/origin-ansible-service-broker:latest
value: ansibleplaybookbundle/origin-ansible-service-broker:release-1.0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we just do this as part of our branching exercise?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe we should. I think in the future, when we talk about branching, we should make sure the container images (and tags) exist for the branch and are up to date then create the new branch with these changes.

Copy link
Contributor

@jmrodri jmrodri left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

seems reasonable.

@eriknelson eriknelson merged commit 5764979 into openshift:release-1.0 Feb 16, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants