Address pr comments
This commit is contained in:
		@@ -85,6 +85,16 @@
 | 
				
			|||||||
                    <healthScaleFactor>100.0</healthScaleFactor>
 | 
					                    <healthScaleFactor>100.0</healthScaleFactor>
 | 
				
			||||||
                </hudson.tasks.junit.JUnitResultArchiver>
 | 
					                </hudson.tasks.junit.JUnitResultArchiver>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# Implements Docker Build and Publish Plugin
 | 
				
			||||||
 | 
					# https://wiki.jenkins-ci.org/display/JENKINS/CloudBees+Docker+Build+and+Publish+plugin
 | 
				
			||||||
 | 
					# From the docs: 'This plugin provides the ability to build projects with a Dockerfile, and publish the resultant
 | 
				
			||||||
 | 
					# tagged image (repo) to the docker registry.'
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					# repoName: docker registry repo name to publish the image
 | 
				
			||||||
 | 
					# dockerfilePath: workspace relative path to the 'Dockerfile' to build
 | 
				
			||||||
 | 
					# tag: Tag to apply to the built image
 | 
				
			||||||
 | 
					# credentialsId: Jenkins 'Username with password' credentials ID (hex string) to authenticate to docker registry.
 | 
				
			||||||
 | 
					#                Found under http:<jenkinsurl>/credentials -> "Advanced"
 | 
				
			||||||
- builder:
 | 
					- builder:
 | 
				
			||||||
    name: docker-build-publish
 | 
					    name: docker-build-publish
 | 
				
			||||||
    builders:
 | 
					    builders:
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,3 +1,13 @@
 | 
				
			|||||||
 | 
					# Job template to checkout source from github to $WORKSPACE/go/src/{gitbasedir} and build + publish a docker image.
 | 
				
			||||||
 | 
					# - Tags the docker image with 'canary'.
 | 
				
			||||||
 | 
					# - Job is executed daily and when changes are found polling github (every 5m).
 | 
				
			||||||
 | 
					# - Console output is published to google cloud storage.
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					# gitproject: name of the project - for display purposes only
 | 
				
			||||||
 | 
					# owner: owner to be notified for job failures.  test results are published to owner email
 | 
				
			||||||
 | 
					# repoName: github repo to checkout e.g. kubernetes/kubernetes or google/cadvisor.  Must match the docker image repo name where the image will be published.
 | 
				
			||||||
 | 
					# gitbasedir: directory under $WORKSPACE/go/src to checkout source repo to - e.g. k8s.io/kubernetes or github.com/google/cadvisor
 | 
				
			||||||
 | 
					# dockerfilePath: workspace relative path to the 'Dockerfile' to build
 | 
				
			||||||
- job-template:
 | 
					- job-template:
 | 
				
			||||||
    name: '{gitproject}-dockercanarybuild-ci'
 | 
					    name: '{gitproject}-dockercanarybuild-ci'
 | 
				
			||||||
    description: 'Build and push {gitproject} docker image.<br>Test Owner: {owner}.'
 | 
					    description: 'Build and push {gitproject} docker image.<br>Test Owner: {owner}.'
 | 
				
			||||||
@@ -38,6 +48,16 @@
 | 
				
			|||||||
            fail: true
 | 
					            fail: true
 | 
				
			||||||
        - timestamps
 | 
					        - timestamps
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# Job template to checkout source from github to $WORKSPACE/go/src/{gitbasedir}, setup go environment variables, and execute a
 | 
				
			||||||
 | 
					# shell script.
 | 
				
			||||||
 | 
					# - Job is executed daily and when changes are found polling github (every 5m).
 | 
				
			||||||
 | 
					# - Console output is published to google cloud storage.
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					# gitproject: name of the project - for display purposes only
 | 
				
			||||||
 | 
					# owner: owner to be notified for job failures.  test results are published to owner email
 | 
				
			||||||
 | 
					# repoName: github repo to checkout e.g. kubernetes/kubernetes or google/cadvisor
 | 
				
			||||||
 | 
					# gitbasedir: directory under $WORKSPACE/go/src to checkout source repo to - e.g. k8s.io/kubernetes or github.com/google/cadvisor
 | 
				
			||||||
 | 
					# shell: shell to execute from workspace
 | 
				
			||||||
- job-template:
 | 
					- job-template:
 | 
				
			||||||
    name: '{gitproject}-gce-e2e-ci'
 | 
					    name: '{gitproject}-gce-e2e-ci'
 | 
				
			||||||
    description: '{gitproject} continuous e2e tests.<br>Test Owner: {owner}.'
 | 
					    description: '{gitproject} continuous e2e tests.<br>Test Owner: {owner}.'
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user