From 3ff2b15f5ed797ec9cda6331fab89789b9c69062 Mon Sep 17 00:00:00 2001 From: Zuhayr Elahi Date: Fri, 13 Sep 2019 12:56:23 -0700 Subject: [PATCH 1/2] Utilized public fossa-analyzer image Signed-off-by: Zuhayr Elahi --- Jenkinsfile.baguette | 2 -- Makefile | 2 +- vars.mk | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile.baguette b/Jenkinsfile.baguette index 6bd33aa89..96909268b 100644 --- a/Jenkinsfile.baguette +++ b/Jenkinsfile.baguette @@ -62,13 +62,11 @@ pipeline { } steps { withCredentials([ - usernamePassword(credentialsId: 'dockerbuildbot-hub.docker.com', usernameVariable: 'REGISTRY_USERNAME', passwordVariable: 'REGISTRY_PASSWORD'), string(credentialsId: 'fossa-api-key', variable: 'FOSSA_API_KEY') ]) { dir('src/github.com/docker/app') { checkout scm ansiColor('xterm') { - sh "docker login -u $REGISTRY_USERNAME -p $REGISTRY_PASSWORD" sh "FOSSA_API_KEY=$FOSSA_API_KEY BRANCH_NAME='${BRANCH_NAME}' make fossa-analyze" sh "FOSSA_API_KEY=$FOSSA_API_KEY make fossa-test" } diff --git a/Makefile b/Makefile index 25697917e..08e35aa4b 100644 --- a/Makefile +++ b/Makefile @@ -122,7 +122,7 @@ fossa-test: docker run -i --rm -e FOSSA_API_KEY=$(FOSSA_API_KEY) \ -v $(CURDIR)/$*:/go/src/github.com/docker/app \ -w /go/src/github.com/docker/app \ - $(BUILD_ANALYZER) test --debug + $(BUILD_ANALYZER) test clean: ## clean build artifacts $(call rmdir,bin) diff --git a/vars.mk b/vars.mk index fa3b90ebe..60e28810d 100644 --- a/vars.mk +++ b/vars.mk @@ -4,7 +4,7 @@ BIN_STANDALONE_NAME := ${BIN_NAME}-standalone E2E_NAME := $(BIN_NAME)-e2e # Variables for fossa scan -BUILD_ANALYZER?=dockereng/fossa-analyzer +BUILD_ANALYZER?=docker/fossa-analyzer FOSSA_OPTS?=--option all-tags:true --option allow-unresolved:true # Enable experimental features. "on" or "off" From 29f8fee5b098f9691672cfdb7e54b5874ed35cd6 Mon Sep 17 00:00:00 2001 From: Zuhayr Elahi Date: Wed, 18 Sep 2019 09:45:21 -0700 Subject: [PATCH 2/2] Removed Fossa api key from Jenkinsfile call Signed-off-by: Zuhayr Elahi --- Jenkinsfile.baguette | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile.baguette b/Jenkinsfile.baguette index 96909268b..729440983 100644 --- a/Jenkinsfile.baguette +++ b/Jenkinsfile.baguette @@ -67,8 +67,8 @@ pipeline { dir('src/github.com/docker/app') { checkout scm ansiColor('xterm') { - sh "FOSSA_API_KEY=$FOSSA_API_KEY BRANCH_NAME='${BRANCH_NAME}' make fossa-analyze" - sh "FOSSA_API_KEY=$FOSSA_API_KEY make fossa-test" + sh "BRANCH_NAME='${BRANCH_NAME}' make fossa-analyze" + sh "make fossa-test" } } }