From 1116b216557d7e8efcaf3c3929922c33104c0197 Mon Sep 17 00:00:00 2001 From: mathild3r <82386195+mathild3r@users.noreply.github.com> Date: Tue, 18 May 2021 11:52:53 +0100 Subject: [PATCH 1/4] Update jenkinsfile --- jenkins/jenkinsfile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/jenkins/jenkinsfile b/jenkins/jenkinsfile index 321f14564f..f67c5f16d4 100644 --- a/jenkins/jenkinsfile +++ b/jenkins/jenkinsfile @@ -44,6 +44,11 @@ pipeline { stage('Snyk Test using Snyk CLI') { steps { echo 'Running Snyk test' + sh 'snyk test --all-projects --json-file-output=snykTestResults.json || true' + sh 'echo $GITHUB_PR_NUMBER' + sh 'echo $GITHUB_PR_SOURCE_REPO_OWNER' + sh 'echo $GITHUB_PR_URL' + sh '-----' sh 'npx snyk-prevent-gh-commit-status ./snykTestResults.json $GITHUB_TOKEN $OWNER_NAME $GIT_REPO_NAME $GIT_COMMIT $GITHUB_PR_URL' } } From 7e60d996e11dbf71099a08048015449ad29de5ee Mon Sep 17 00:00:00 2001 From: mathild3r <82386195+mathild3r@users.noreply.github.com> Date: Tue, 18 May 2021 12:08:39 +0100 Subject: [PATCH 2/4] Update jenkinsfile --- jenkins/jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/jenkinsfile b/jenkins/jenkinsfile index f67c5f16d4..17526e32ac 100644 --- a/jenkins/jenkinsfile +++ b/jenkins/jenkinsfile @@ -48,7 +48,7 @@ pipeline { sh 'echo $GITHUB_PR_NUMBER' sh 'echo $GITHUB_PR_SOURCE_REPO_OWNER' sh 'echo $GITHUB_PR_URL' - sh '-----' + sh 'echo -----' sh 'npx snyk-prevent-gh-commit-status ./snykTestResults.json $GITHUB_TOKEN $OWNER_NAME $GIT_REPO_NAME $GIT_COMMIT $GITHUB_PR_URL' } } From acb0512ebc9b87e96245da874a9e3f206adb954c Mon Sep 17 00:00:00 2001 From: mathild3r <82386195+mathild3r@users.noreply.github.com> Date: Tue, 18 May 2021 14:43:01 +0100 Subject: [PATCH 3/4] Update jenkinsfile --- jenkins/jenkinsfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/jenkins/jenkinsfile b/jenkins/jenkinsfile index 17526e32ac..944240cb86 100644 --- a/jenkins/jenkinsfile +++ b/jenkins/jenkinsfile @@ -45,11 +45,12 @@ pipeline { steps { echo 'Running Snyk test' sh 'snyk test --all-projects --json-file-output=snykTestResults.json || true' - sh 'echo $GITHUB_PR_NUMBER' - sh 'echo $GITHUB_PR_SOURCE_REPO_OWNER' - sh 'echo $GITHUB_PR_URL' + sh 'echo $CHANGE_URL' + sh 'echo $CHANGE_TITLE' + sh 'echo $CHANGE_AUTHOR' + sh 'echo CHANGE_AUTHOR_DISPLAY_NAME' sh 'echo -----' - sh 'npx snyk-prevent-gh-commit-status ./snykTestResults.json $GITHUB_TOKEN $OWNER_NAME $GIT_REPO_NAME $GIT_COMMIT $GITHUB_PR_URL' + sh 'npx snyk-prevent-gh-commit-status ./snykTestResults.json $GITHUB_TOKEN $OWNER_NAME $GIT_REPO_NAME $GIT_COMMIT $CHANGE_URL' } } } From 975e8eb185d795e56cb6c74354221ce20757624d Mon Sep 17 00:00:00 2001 From: mathild3r <82386195+mathild3r@users.noreply.github.com> Date: Tue, 18 May 2021 16:03:33 +0100 Subject: [PATCH 4/4] Update jenkinsfile --- jenkins/jenkinsfile | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/jenkins/jenkinsfile b/jenkins/jenkinsfile index 944240cb86..22be01486c 100644 --- a/jenkins/jenkinsfile +++ b/jenkins/jenkinsfile @@ -12,7 +12,6 @@ pipeline { SNYK_TOKEN = credentials('snyk-api-token') GITHUB_TOKEN = credentials('GITHUB_TOKEN') GIT_REPO_NAME = 'java_goof' - OWNER_NAME = 'mathild3r' } stages { @@ -45,12 +44,7 @@ pipeline { steps { echo 'Running Snyk test' sh 'snyk test --all-projects --json-file-output=snykTestResults.json || true' - sh 'echo $CHANGE_URL' - sh 'echo $CHANGE_TITLE' - sh 'echo $CHANGE_AUTHOR' - sh 'echo CHANGE_AUTHOR_DISPLAY_NAME' - sh 'echo -----' - sh 'npx snyk-prevent-gh-commit-status ./snykTestResults.json $GITHUB_TOKEN $OWNER_NAME $GIT_REPO_NAME $GIT_COMMIT $CHANGE_URL' + sh 'npx snyk-prevent-gh-commit-status ./snykTestResults.json $GITHUB_TOKEN $CHANGE_AUTHOR $GIT_REPO_NAME $GIT_COMMIT $CHANGE_ID' } } }