Merge pull request #460 from rumpl/fix-coverage

silvin-lubecki · web-flow · commit d5784ea88535 · 2019-02-14T16:25:47.000+01:00
Fix coverage on Jenkins
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -73,15 +73,21 @@ pipeline {
                         dir('src/github.com/docker/app') {
                             checkout scm
                             sh 'make -f docker.Makefile save-invocation-image'
+                            sh 'make -f docker.Makefile INVOCATION_IMAGE_TAG=$BUILD_TAG-coverage OUTPUT=coverage-invocation-image.tar save-invocation-image-tag'
+                            sh 'make -f docker.Makefile INVOCATION_IMAGE_TAG=$BUILD_TAG-coverage-experimental OUTPUT=coverage-experimental-invocation-image.tar save-invocation-image-tag'
                             dir('_build') {
                                 stash name: 'invocation-image', includes: 'invocation-image.tar'
+                                stash name: 'coverage-invocation-image', includes: 'coverage-invocation-image.tar'
+                                stash name: 'coverage-experimental-invocation-image', includes: 'coverage-experimental-invocation-image.tar'
                             }
                         }
                     }
                     post {
                         always {
                             dir('src/github.com/docker/app') {
                                 sh 'docker rmi docker/cnab-app-base:$BUILD_TAG'
+                                sh 'docker rmi docker/cnab-app-base:$BUILD_TAG-coverage'
+                                sh 'docker rmi docker/cnab-app-base:$BUILD_TAG-coverage-experimental'
                             }
                             deleteDir()
                         }
@@ -99,16 +105,17 @@ pipeline {
                         dir('src/github.com/docker/app') {
                             checkout scm
                             dir('_build') {
-                                unstash "invocation-image"
-                                sh 'docker load -i invocation-image.tar'
+                                unstash "coverage-invocation-image"
+                                sh 'docker load -i coverage-invocation-image.tar'
                             }
-                            sh 'make -f docker.Makefile coverage'
+                            sh 'make -f docker.Makefile BUILD_TAG=$BUILD_TAG-coverage coverage'
                             archiveArtifacts '_build/ci-cov/all.out'
                             archiveArtifacts '_build/ci-cov/coverage.html'
                         }
                     }
                     post {
                         always {
+                            sh 'docker rmi docker/cnab-app-base:$BUILD_TAG-coverage'
                             deleteDir()
                         }
                     }
@@ -121,14 +128,15 @@ pipeline {
                         dir('src/github.com/docker/app') {
                             checkout scm
                             dir('_build') {
-                                unstash "invocation-image"
-                                sh 'docker load -i invocation-image.tar'
+                                unstash "coverage-experimental-invocation-image"
+                                sh 'docker load -i coverage-experimental-invocation-image.tar'
                             }
-                            sh 'make EXPERIMENTAL=on -f docker.Makefile coverage'
+                            sh 'make EXPERIMENTAL=on -f docker.Makefile BUILD_TAG=$BUILD_TAG-coverage-experimental coverage'
                         }
                     }
                     post {
                         always {
+                            sh 'docker rmi docker/cnab-app-base:$BUILD_TAG-coverage-experimental'
                             deleteDir()
                         }
                     }
diff --git a/Jenkinsfile.baguette b/Jenkinsfile.baguette
@@ -60,15 +60,18 @@ pipeline {
                         dir('src/github.com/docker/app') {
                             checkout scm
                             sh 'make -f docker.Makefile save-invocation-image'
+                            sh 'make -f docker.Makefile save-invocation-image-tag INVOCATION_IMAGE_TAG=$BUILD_TAG-coverage OUTPUT=coverage-invocation-image.tar'
                             dir('_build') {
                                 stash name: 'invocation-image', includes: 'invocation-image.tar'
+                                stash name: 'coverage-invocation-image', includes: 'coverage-invocation-image.tar'
                                 archiveArtifacts 'invocation-image.tar'
                             }
                         }
                     }
                     post {
                         always {
                             sh 'docker rmi docker/cnab-app-base:$BUILD_TAG'
+                            sh 'docker rmi docker/cnab-app-base:$BUILD_TAG-coverage'
                             deleteDir()
                         }
                     }
@@ -87,12 +90,22 @@ pipeline {
                     steps {
                         dir('src/github.com/docker/app') {
                             checkout scm
-                            sh 'make -f docker.Makefile coverage'
+                            dir('_build') {
+                                unstash "coverage-invocation-image"
+                                sh 'docker load -i coverage-invocation-image.tar'
+                            }
+                            sh 'make -f docker.Makefile BUILD_TAG=$BUILD_TAG-coverage coverage'
                             archiveArtifacts '_build/ci-cov/all.out'
                             archiveArtifacts '_build/ci-cov/coverage.html'
                             sh 'curl -s https://codecov.io/bash | bash -s - -f _build/ci-cov/all.out -K'
                         }
                     }
+                    post {
+                        always {
+                            sh 'docker rmi docker/cnab-app-base:$BUILD_TAG-coverage'
+                            deleteDir()
+                        }
+                    }
                 }
                 stage("Gradle test") {
                     agent {
diff --git a/docker.Makefile b/docker.Makefile
@@ -19,9 +19,12 @@ BUILD_ARGS=--build-arg=EXPERIMENTAL=$(EXPERIMENTAL) --build-arg=TAG=$(TAG) --bui
 
 PKG_PATH := /go/src/$(PKG_NAME)
 
-PUSH_CNAB_BASE_INVOCATION_IMAGE_NAME := docker/cnab-app-base:$(TAG)
+
+CNAB_BASE_INVOCATION_IMAGE_NAME := docker/cnab-app-base:$(BUILD_TAG)
 CNAB_BASE_INVOCATION_IMAGE_PATH := _build/invocation-image.tar
 
+PUSH_CNAB_BASE_INVOCATION_IMAGE_NAME := docker/cnab-app-base:$(TAG)
+
 .DEFAULT: all
 all: cross test
 
@@ -114,6 +117,10 @@ schemas: specification/bindata.go ## generate specification/bindata.go from json
 invocation-image:
 	docker build -f Dockerfile.invocation-image $(BUILD_ARGS) --target=invocation -t $(CNAB_BASE_INVOCATION_IMAGE_NAME) .
 
+save-invocation-image-tag:
+	docker tag $(CNAB_BASE_INVOCATION_IMAGE_NAME) docker/cnab-app-base:$(INVOCATION_IMAGE_TAG)
+	docker save docker/cnab-app-base:$(INVOCATION_IMAGE_TAG) -o _build/$(OUTPUT)
+
 save-invocation-image: invocation-image
 	@$(call mkdir,_build)
 	docker save $(CNAB_BASE_INVOCATION_IMAGE_NAME) -o $(CNAB_BASE_INVOCATION_IMAGE_PATH)
@@ -125,4 +132,4 @@ push-invocation-image:
 help: ## this help
 	@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST) | sort
 
-.PHONY: lint test-e2e test-unit test cli-cross cross e2e-cross coverage gradle-test shell build_dev_image tars vendor schemas help save-invocation-image push-invocation-image
+.PHONY: lint test-e2e test-unit test cli-cross cross e2e-cross coverage gradle-test shell build_dev_image tars vendor schemas help invocation-image save-invocation-image save-invocation-image-tag push-invocation-image
diff --git a/vars.mk b/vars.mk
@@ -35,5 +35,3 @@ endif
 ifeq ($(TAG),)
   TAG := $(BUILD_TAG)
 endif
-
-CNAB_BASE_INVOCATION_IMAGE_NAME := docker/cnab-app-base:$(BUILD_TAG)

Original file line number	Diff line number	Diff line change
`@@ -73,15 +73,21 @@ pipeline {`
`73`	`73`	`dir('src/github.com/docker/app') {`
`74`	`74`	`checkout scm`
`75`	`75`	`sh 'make -f docker.Makefile save-invocation-image'`
	`76`	`+ sh 'make -f docker.Makefile INVOCATION_IMAGE_TAG=$BUILD_TAG-coverage OUTPUT=coverage-invocation-image.tar save-invocation-image-tag'`
	`77`	`+ sh 'make -f docker.Makefile INVOCATION_IMAGE_TAG=$BUILD_TAG-coverage-experimental OUTPUT=coverage-experimental-invocation-image.tar save-invocation-image-tag'`
`76`	`78`	`dir('_build') {`
`77`	`79`	`stash name: 'invocation-image', includes: 'invocation-image.tar'`
	`80`	`+ stash name: 'coverage-invocation-image', includes: 'coverage-invocation-image.tar'`
	`81`	`+ stash name: 'coverage-experimental-invocation-image', includes: 'coverage-experimental-invocation-image.tar'`
`78`	`82`	`}`
`79`	`83`	`}`
`80`	`84`	`}`
`81`	`85`	`post {`
`82`	`86`	`always {`
`83`	`87`	`dir('src/github.com/docker/app') {`
`84`	`88`	`sh 'docker rmi docker/cnab-app-base:$BUILD_TAG'`
	`89`	`+ sh 'docker rmi docker/cnab-app-base:$BUILD_TAG-coverage'`
	`90`	`+ sh 'docker rmi docker/cnab-app-base:$BUILD_TAG-coverage-experimental'`
`85`	`91`	`}`
`86`	`92`	`deleteDir()`
`87`	`93`	`}`
`@@ -99,16 +105,17 @@ pipeline {`
`99`	`105`	`dir('src/github.com/docker/app') {`
`100`	`106`	`checkout scm`
`101`	`107`	`dir('_build') {`
`102`		`- unstash "invocation-image"`
`103`		`- sh 'docker load -i invocation-image.tar'`
	`108`	`+ unstash "coverage-invocation-image"`
	`109`	`+ sh 'docker load -i coverage-invocation-image.tar'`
`104`	`110`	`}`
`105`		`- sh 'make -f docker.Makefile coverage'`
	`111`	`+ sh 'make -f docker.Makefile BUILD_TAG=$BUILD_TAG-coverage coverage'`
`106`	`112`	`archiveArtifacts '_build/ci-cov/all.out'`
`107`	`113`	`archiveArtifacts '_build/ci-cov/coverage.html'`
`108`	`114`	`}`
`109`	`115`	`}`
`110`	`116`	`post {`
`111`	`117`	`always {`
	`118`	`+ sh 'docker rmi docker/cnab-app-base:$BUILD_TAG-coverage'`
`112`	`119`	`deleteDir()`
`113`	`120`	`}`
`114`	`121`	`}`
`@@ -121,14 +128,15 @@ pipeline {`
`121`	`128`	`dir('src/github.com/docker/app') {`
`122`	`129`	`checkout scm`
`123`	`130`	`dir('_build') {`
`124`		`- unstash "invocation-image"`
`125`		`- sh 'docker load -i invocation-image.tar'`
	`131`	`+ unstash "coverage-experimental-invocation-image"`
	`132`	`+ sh 'docker load -i coverage-experimental-invocation-image.tar'`
`126`	`133`	`}`
`127`		`- sh 'make EXPERIMENTAL=on -f docker.Makefile coverage'`
	`134`	`+ sh 'make EXPERIMENTAL=on -f docker.Makefile BUILD_TAG=$BUILD_TAG-coverage-experimental coverage'`
`128`	`135`	`}`
`129`	`136`	`}`
`130`	`137`	`post {`
`131`	`138`	`always {`
	`139`	`+ sh 'docker rmi docker/cnab-app-base:$BUILD_TAG-coverage-experimental'`
`132`	`140`	`deleteDir()`
`133`	`141`	`}`
`134`	`142`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,15 +60,18 @@ pipeline {`
`60`	`60`	`dir('src/github.com/docker/app') {`
`61`	`61`	`checkout scm`
`62`	`62`	`sh 'make -f docker.Makefile save-invocation-image'`
	`63`	`+ sh 'make -f docker.Makefile save-invocation-image-tag INVOCATION_IMAGE_TAG=$BUILD_TAG-coverage OUTPUT=coverage-invocation-image.tar'`
`63`	`64`	`dir('_build') {`
`64`	`65`	`stash name: 'invocation-image', includes: 'invocation-image.tar'`
	`66`	`+ stash name: 'coverage-invocation-image', includes: 'coverage-invocation-image.tar'`
`65`	`67`	`archiveArtifacts 'invocation-image.tar'`
`66`	`68`	`}`
`67`	`69`	`}`
`68`	`70`	`}`
`69`	`71`	`post {`
`70`	`72`	`always {`
`71`	`73`	`sh 'docker rmi docker/cnab-app-base:$BUILD_TAG'`
	`74`	`+ sh 'docker rmi docker/cnab-app-base:$BUILD_TAG-coverage'`
`72`	`75`	`deleteDir()`
`73`	`76`	`}`
`74`	`77`	`}`
`@@ -87,12 +90,22 @@ pipeline {`
`87`	`90`	`steps {`
`88`	`91`	`dir('src/github.com/docker/app') {`
`89`	`92`	`checkout scm`
`90`		`- sh 'make -f docker.Makefile coverage'`
	`93`	`+ dir('_build') {`
	`94`	`+ unstash "coverage-invocation-image"`
	`95`	`+ sh 'docker load -i coverage-invocation-image.tar'`
	`96`	`+ }`
	`97`	`+ sh 'make -f docker.Makefile BUILD_TAG=$BUILD_TAG-coverage coverage'`
`91`	`98`	`archiveArtifacts '_build/ci-cov/all.out'`
`92`	`99`	`archiveArtifacts '_build/ci-cov/coverage.html'`
`93`	`100`	`sh 'curl -s https://codecov.io/bash \| bash -s - -f _build/ci-cov/all.out -K'`
`94`	`101`	`}`
`95`	`102`	`}`
	`103`	`+ post {`
	`104`	`+ always {`
	`105`	`+ sh 'docker rmi docker/cnab-app-base:$BUILD_TAG-coverage'`
	`106`	`+ deleteDir()`
	`107`	`+ }`
	`108`	`+ }`
`96`	`109`	`}`
`97`	`110`	`stage("Gradle test") {`
`98`	`111`	`agent {`