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

Update pipeline template annotations #9328

Merged

Conversation

spadgett
Copy link
Member

@spadgett spadgett commented Jun 14, 2016

  • Move Jenkins pipeline template service annotations to correct resource
  • Add pipeline.alpha.openshift.io/uses to the pipeline BuildConfig

@bparees PTAL
@jwforres CC

@bparees
Copy link
Contributor

bparees commented Jun 14, 2016

needs hack/gen-bootstrap run

@spadgett spadgett force-pushed the fix-jenkins-service-annotations branch from 761aaf8 to ea107f8 Compare June 14, 2016 17:50
@spadgett
Copy link
Member Author

thanks @bparees another look?

@bparees
Copy link
Contributor

bparees commented Jun 14, 2016

lgtm [merge]

* Move Jenkins pipeline template service annotations to correct resource
* Add pipeline.alpha.openshift.io/uses to the pipeline BuildConfig
@spadgett spadgett force-pushed the fix-jenkins-service-annotations branch from ea107f8 to f09261f Compare June 14, 2016 18:04
@spadgett
Copy link
Member Author

@bparees Spoke to @smarterclayton. We want to use pipeline.alpha.openshift.io/uses for the build config annotation. Added it to the PR.

@smarterclayton Look right?

@openshift-bot
Copy link
Contributor

openshift-bot commented Jun 14, 2016

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/4854/) (Image: devenv-rhel7_4373)

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to f09261f

@openshift-bot
Copy link
Contributor

[Test]ing while waiting on the merge queue

@@ -19,6 +19,9 @@
"creationTimestamp": null,
"labels": {
"name": "sample-pipeline"
},
"annotations": {
"pipeline.alpha.openshift.io/uses": "[{\"name\": \"frontend\", \"namespace\": \"\", \"kind\": \"DeploymentConfig\"}]"
Copy link
Contributor

Choose a reason for hiding this comment

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

is this supplanting this pr:
#9275
?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes.

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to f09261f

@spadgett spadgett changed the title Move Jenkins pipeline template service annotations to correct resource Update pipeline template annotations Jun 14, 2016
@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/4854/)

@openshift-bot openshift-bot merged commit 2326e1e into openshift:master Jun 14, 2016
@spadgett spadgett deleted the fix-jenkins-service-annotations branch August 17, 2016 12:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants