From c7ae458c72b55521995a3d119199b170b1eed466 Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Tue, 22 Oct 2019 21:31:16 -0700 Subject: [PATCH 01/75] wip --- ci/parameters.yml | 14 ++++++++++++++ ci/pipeline.yml | 16 ++++++++++++++++ ci/tasks/build.yml | 19 +++++++++++++++++++ 3 files changed, 49 insertions(+) create mode 100644 ci/parameters.yml create mode 100644 ci/pipeline.yml create mode 100644 ci/tasks/build.yml diff --git a/ci/parameters.yml b/ci/parameters.yml new file mode 100644 index 00000000000..2a7553b800a --- /dev/null +++ b/ci/parameters.yml @@ -0,0 +1,14 @@ +email-server: "smtp.svc.pivotal.io" +email-from: "ci@spring.io" +email-to: ["fhanik@pivotal.io"] +github-repo: "https://github.com/fhanik/spring-security.git" +github-repo-name: "fhanik/spring-security" +docker-hub-organization: "springci" +artifactory-server: "https://repo.spring.io" +branch: "feature/concourse" +build-name: "spring-security" +pipeline-name: "spring-security" +concourse-url: "https://ci.spring.io" +bintray-subject: "spring" +bintray-repo: "jars" +task-timeout: 2h00m diff --git a/ci/pipeline.yml b/ci/pipeline.yml new file mode 100644 index 00000000000..e58eb6b06cf --- /dev/null +++ b/ci/pipeline.yml @@ -0,0 +1,16 @@ +resources: + - name: git-repo + type: git + icon: github-circle + source: + uri: ((github-repo)) + branch: ((branch)) + +jobs: + - name: run-build + plan: + - get: git-repo + trigger: true + - task: build + file: git-repo/ci/tasks/build.yml + diff --git a/ci/tasks/build.yml b/ci/tasks/build.yml new file mode 100644 index 00000000000..587d565ca8f --- /dev/null +++ b/ci/tasks/build.yml @@ -0,0 +1,19 @@ +--- +platform: linux +image_resource: + type: docker-image + source: + repository: openjdk + tag: 8-jdk +inputs: + - name: git-repo +outputs: + - name: out +run: + path: git-repo/gradlew + args: ["clean", "build"] + +caches: + - path: gradle + - path: maven + From 6e69625b07c146647f3ce4cdf626a8a3379ba509 Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Tue, 22 Oct 2019 21:40:01 -0700 Subject: [PATCH 02/75] wip 3 --- ci/pipeline.yml | 1 - ci/tasks/build.yml | 4 ---- 2 files changed, 5 deletions(-) diff --git a/ci/pipeline.yml b/ci/pipeline.yml index e58eb6b06cf..6cee4b96c77 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -1,7 +1,6 @@ resources: - name: git-repo type: git - icon: github-circle source: uri: ((github-repo)) branch: ((branch)) diff --git a/ci/tasks/build.yml b/ci/tasks/build.yml index 587d565ca8f..a12feb95db2 100644 --- a/ci/tasks/build.yml +++ b/ci/tasks/build.yml @@ -13,7 +13,3 @@ run: path: git-repo/gradlew args: ["clean", "build"] -caches: - - path: gradle - - path: maven - From 66b806e88932379f9665a05a6a69438f26665adc Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Tue, 22 Oct 2019 21:42:47 -0700 Subject: [PATCH 03/75] wip 4 --- ci/tasks/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/tasks/build.yml b/ci/tasks/build.yml index a12feb95db2..dde7ebdc1b1 100644 --- a/ci/tasks/build.yml +++ b/ci/tasks/build.yml @@ -11,5 +11,5 @@ outputs: - name: out run: path: git-repo/gradlew - args: ["clean", "build"] + args: ["build"] From 3b5f5607f369a8f41c0d47b3100c232c6d7d003f Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Tue, 22 Oct 2019 21:46:42 -0700 Subject: [PATCH 04/75] wip 5 --- ci/tasks/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/tasks/build.yml b/ci/tasks/build.yml index dde7ebdc1b1..1bc1e3526b1 100644 --- a/ci/tasks/build.yml +++ b/ci/tasks/build.yml @@ -10,6 +10,7 @@ inputs: outputs: - name: out run: - path: git-repo/gradlew + path: ./gradlew args: ["build"] + dir: git-repo From b3e2a910b35b26148dbae5a52a3cb34c0a76be9b Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Tue, 22 Oct 2019 22:18:05 -0700 Subject: [PATCH 05/75] wip 6 --- ci/tasks/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/tasks/build.yml b/ci/tasks/build.yml index 1bc1e3526b1..c8fb156e19d 100644 --- a/ci/tasks/build.yml +++ b/ci/tasks/build.yml @@ -11,6 +11,6 @@ outputs: - name: out run: path: ./gradlew - args: ["build"] + args: ["build", "--no-daemon"] dir: git-repo From 647acdb9d674db8ddf9e5a70f2c39de52e89cc93 Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Tue, 22 Oct 2019 22:43:27 -0700 Subject: [PATCH 06/75] wip 7 --- ci/tasks/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/tasks/build.yml b/ci/tasks/build.yml index c8fb156e19d..5c25564d46f 100644 --- a/ci/tasks/build.yml +++ b/ci/tasks/build.yml @@ -11,6 +11,6 @@ outputs: - name: out run: path: ./gradlew - args: ["build", "--no-daemon"] + args: ["clean", "build", "--no-daemon"] dir: git-repo From f6bbc5149e58eb1f06fd5be409aeffaa9572857e Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Mon, 2 Dec 2019 10:16:51 -0800 Subject: [PATCH 07/75] wip --- ci/pipeline.yml | 12 ++++++++++-- ci/tasks/build.yml | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ci/pipeline.yml b/ci/pipeline.yml index 6cee4b96c77..bb56bc7fb7e 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -10,6 +10,14 @@ jobs: plan: - get: git-repo trigger: true - - task: build - file: git-repo/ci/tasks/build.yml + - in_parallel: + - task: build + file: git-repo/ci/tasks/build.yml + params: + openjdk-tag: 8-jdk + - task: build + file: git-repo/ci/tasks/build.yml + params: + openjdk-tag: openjdk:12 + diff --git a/ci/tasks/build.yml b/ci/tasks/build.yml index 5c25564d46f..e8076d573a2 100644 --- a/ci/tasks/build.yml +++ b/ci/tasks/build.yml @@ -4,7 +4,7 @@ image_resource: type: docker-image source: repository: openjdk - tag: 8-jdk + tag: ((openjdk-tag)) inputs: - name: git-repo outputs: From 35cee8121e232814114edc90cda900506da0cf05 Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Mon, 2 Dec 2019 10:18:09 -0800 Subject: [PATCH 08/75] wip 8 --- ci/pipeline.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/pipeline.yml b/ci/pipeline.yml index bb56bc7fb7e..31afb9d822c 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -11,11 +11,11 @@ jobs: - get: git-repo trigger: true - in_parallel: - - task: build + - task: build-jdk-8 file: git-repo/ci/tasks/build.yml params: openjdk-tag: 8-jdk - - task: build + - task: build-jdk-12 file: git-repo/ci/tasks/build.yml params: openjdk-tag: openjdk:12 From 27d04782549a0a2189f98012f4efca788a4987bb Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Mon, 2 Dec 2019 11:50:29 -0800 Subject: [PATCH 09/75] wip - variables not working --- ci/parameters.yml | 3 +++ ci/pipeline.yml | 6 ++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ci/parameters.yml b/ci/parameters.yml index 2a7553b800a..2c472b1c597 100644 --- a/ci/parameters.yml +++ b/ci/parameters.yml @@ -12,3 +12,6 @@ concourse-url: "https://ci.spring.io" bintray-subject: "spring" bintray-repo: "jars" task-timeout: 2h00m +openjdk-8-tag: 8-jdk +openjdk-12-tag: openjdk:12 + diff --git a/ci/pipeline.yml b/ci/pipeline.yml index 31afb9d822c..c062d3dc2b0 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -13,11 +13,9 @@ jobs: - in_parallel: - task: build-jdk-8 file: git-repo/ci/tasks/build.yml - params: - openjdk-tag: 8-jdk + params: {openjdk-tag: ((openjdk-8-tag))} - task: build-jdk-12 file: git-repo/ci/tasks/build.yml - params: - openjdk-tag: openjdk:12 + params: {openjdk-tag: ((openjdk-12-tag))} From 22ebc0236dbd289cf575dd7851d47338fbb413ef Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Tue, 3 Dec 2019 02:16:20 -0800 Subject: [PATCH 10/75] wip - restore readme --- ci/README.adoc | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 ci/README.adoc diff --git a/ci/README.adoc b/ci/README.adoc new file mode 100644 index 00000000000..c171df02bb9 --- /dev/null +++ b/ci/README.adoc @@ -0,0 +1,22 @@ +== Concourse pipeline + +Ensure that you've setup the spring-security target and can login + +Pipeline will be visible at + +https://ci.spring.io/teams/spring-security/pipelines/spring-security + +[source] +---- +$ fly -t spring-security login -n spring-security -c https://ci.spring.io +---- + +The pipeline can be deployed using the following command: + +[source] +---- +$ fly -t spring-security set-pipeline -p spring-security -c ci/pipeline.yml -l ci/parameters.yml +---- + +NOTE: This assumes that you have credhub integration configured with the appropriate +secrets, once secrets are required. From 27c7ada6a1423a8c3969768f1dbf9c405240d081 Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Tue, 3 Dec 2019 11:16:53 +0100 Subject: [PATCH 11/75] wip 9 --- ci/pipeline.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/pipeline.yml b/ci/pipeline.yml index c062d3dc2b0..4abf77e20bb 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -13,9 +13,9 @@ jobs: - in_parallel: - task: build-jdk-8 file: git-repo/ci/tasks/build.yml - params: {openjdk-tag: ((openjdk-8-tag))} + vars: {openjdk-tag: ((openjdk-8-tag))} - task: build-jdk-12 file: git-repo/ci/tasks/build.yml - params: {openjdk-tag: ((openjdk-12-tag))} + vars: {openjdk-tag: ((openjdk-12-tag))} From 8d18f837567a5909c3e6299144a67b6f1a64ecc7 Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Tue, 3 Dec 2019 11:40:50 +0100 Subject: [PATCH 12/75] wip - fix tag name --- ci/parameters.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/parameters.yml b/ci/parameters.yml index 2c472b1c597..63ad34d2499 100644 --- a/ci/parameters.yml +++ b/ci/parameters.yml @@ -13,5 +13,5 @@ bintray-subject: "spring" bintray-repo: "jars" task-timeout: 2h00m openjdk-8-tag: 8-jdk -openjdk-12-tag: openjdk:12 +openjdk-12-tag: 12-jdk From 20b9094285d6f14031e73d415483431538e6554f Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Tue, 3 Dec 2019 12:03:28 +0100 Subject: [PATCH 13/75] rename output based on JDK used --- ci/tasks/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/tasks/build.yml b/ci/tasks/build.yml index e8076d573a2..fef0dce2ea1 100644 --- a/ci/tasks/build.yml +++ b/ci/tasks/build.yml @@ -8,7 +8,7 @@ image_resource: inputs: - name: git-repo outputs: - - name: out + - name: out-((openjdk-tag)) run: path: ./gradlew args: ["clean", "build", "--no-daemon"] From cb600c37e6f21e5ee99b3af1119510d06898c385 Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Tue, 3 Dec 2019 12:17:35 +0100 Subject: [PATCH 14/75] Group different JDK builds under a single build --- ci/parameters.yml | 2 ++ ci/pipeline.yml | 36 ++++++++++++++++++++++++++++-------- 2 files changed, 30 insertions(+), 8 deletions(-) diff --git a/ci/parameters.yml b/ci/parameters.yml index 63ad34d2499..6fe351a1446 100644 --- a/ci/parameters.yml +++ b/ci/parameters.yml @@ -13,5 +13,7 @@ bintray-subject: "spring" bintray-repo: "jars" task-timeout: 2h00m openjdk-8-tag: 8-jdk +openjdk-9-tag: 9-jdk +openjdk-11-tag: 11-jdk openjdk-12-tag: 12-jdk diff --git a/ci/pipeline.yml b/ci/pipeline.yml index 4abf77e20bb..36afb8fb9b3 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -6,16 +6,36 @@ resources: branch: ((branch)) jobs: - - name: run-build + - name: build-jdk8 plan: - get: git-repo trigger: true - - in_parallel: - - task: build-jdk-8 - file: git-repo/ci/tasks/build.yml - vars: {openjdk-tag: ((openjdk-8-tag))} - - task: build-jdk-12 - file: git-repo/ci/tasks/build.yml - vars: {openjdk-tag: ((openjdk-12-tag))} + - task: build-jdk-8 + file: git-repo/ci/tasks/build.yml + vars: {openjdk-tag: ((openjdk-8-tag))} + - name: build-jdk9 + plan: + - get: git-repo + trigger: true + - task: build-jdk-9 + file: git-repo/ci/tasks/build.yml + vars: {openjdk-tag: ((openjdk-9-tag))} + - name: build-jdk11 + plan: + - get: git-repo + trigger: true + - task: build-jdk-11 + file: git-repo/ci/tasks/build.yml + vars: {openjdk-tag: ((openjdk-11-tag))} + - name: build-jdk12 + plan: + - get: git-repo + trigger: true + - task: build-jdk-12 + file: git-repo/ci/tasks/build.yml + vars: {openjdk-tag: ((openjdk-12-tag))} +groups: + - name: "Build" + jobs: ["build-jdk8", "build-jdk9", "build-jdk11", "build-jdk12"] From 2bca6197e007e13e517118e23aeb992943a2c5ac Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Tue, 3 Dec 2019 12:42:01 +0100 Subject: [PATCH 15/75] Add basic (not working yet) PR support --- ci/parameters.yml | 2 +- ci/pipeline.yml | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/ci/parameters.yml b/ci/parameters.yml index 6fe351a1446..e88684731a2 100644 --- a/ci/parameters.yml +++ b/ci/parameters.yml @@ -11,7 +11,7 @@ pipeline-name: "spring-security" concourse-url: "https://ci.spring.io" bintray-subject: "spring" bintray-repo: "jars" -task-timeout: 2h00m +task-timeout: 1h00m openjdk-8-tag: 8-jdk openjdk-9-tag: 9-jdk openjdk-11-tag: 11-jdk diff --git a/ci/pipeline.yml b/ci/pipeline.yml index 36afb8fb9b3..4fd73114a25 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -4,6 +4,14 @@ resources: source: uri: ((github-repo)) branch: ((branch)) + ignore_paths: ["ci/*"] + - name: git-pull-request + type: pull-request + icon: source-pull + source: + repo: ((github-repo-name)) + base: ((branch)) + ignore_paths: ["ci/*"] jobs: - name: build-jdk8 @@ -13,6 +21,7 @@ jobs: - task: build-jdk-8 file: git-repo/ci/tasks/build.yml vars: {openjdk-tag: ((openjdk-8-tag))} + timeout: ((task-timeout)) - name: build-jdk9 plan: - get: git-repo @@ -20,6 +29,7 @@ jobs: - task: build-jdk-9 file: git-repo/ci/tasks/build.yml vars: {openjdk-tag: ((openjdk-9-tag))} + timeout: ((task-timeout)) - name: build-jdk11 plan: - get: git-repo @@ -27,6 +37,7 @@ jobs: - task: build-jdk-11 file: git-repo/ci/tasks/build.yml vars: {openjdk-tag: ((openjdk-11-tag))} + timeout: ((task-timeout)) - name: build-jdk12 plan: - get: git-repo @@ -34,8 +45,26 @@ jobs: - task: build-jdk-12 file: git-repo/ci/tasks/build.yml vars: {openjdk-tag: ((openjdk-12-tag))} + timeout: ((task-timeout)) + - name: build-pull-requests + serial: true + public: true + plan: + - get: git-repo + resource: git-pull-request + trigger: true + version: every + - put: git-pull-request + params: + path: git-repo + - task: build-jdk-8-pr + file: git-repo/ci/tasks/build.yml + vars: {openjdk-tag: ((openjdk-8-tag))} + timeout: ((task-timeout)) groups: - name: "Build" jobs: ["build-jdk8", "build-jdk9", "build-jdk11", "build-jdk12"] + - name: "Build Pull Requests" + jobs: ["build-pull-requests"] From 3004cbb06e23ca45a8514e00798597f102378bb8 Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Tue, 3 Dec 2019 12:46:30 +0100 Subject: [PATCH 16/75] Include CI paths for regular builds --- ci/pipeline.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ci/pipeline.yml b/ci/pipeline.yml index 4fd73114a25..6a9b7afcbda 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -4,7 +4,6 @@ resources: source: uri: ((github-repo)) branch: ((branch)) - ignore_paths: ["ci/*"] - name: git-pull-request type: pull-request icon: source-pull @@ -54,9 +53,6 @@ jobs: resource: git-pull-request trigger: true version: every - - put: git-pull-request - params: - path: git-repo - task: build-jdk-8-pr file: git-repo/ci/tasks/build.yml vars: {openjdk-tag: ((openjdk-8-tag))} From 73c96f99ca63f0ddbf566b990101161455d2088e Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Tue, 10 Dec 2019 09:58:48 -0800 Subject: [PATCH 17/75] Parameterize the actual build command for Java 11+ --- ci/parameters.yml | 2 ++ ci/pipeline.yml | 8 ++++---- ci/tasks/build.yml | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ci/parameters.yml b/ci/parameters.yml index e88684731a2..5a3b37452f0 100644 --- a/ci/parameters.yml +++ b/ci/parameters.yml @@ -16,4 +16,6 @@ openjdk-8-tag: 8-jdk openjdk-9-tag: 9-jdk openjdk-11-tag: 11-jdk openjdk-12-tag: 12-jdk +build-java8-cmd: build +build-java11-cmd: test diff --git a/ci/pipeline.yml b/ci/pipeline.yml index 6a9b7afcbda..0132f4e75f4 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -19,7 +19,7 @@ jobs: trigger: true - task: build-jdk-8 file: git-repo/ci/tasks/build.yml - vars: {openjdk-tag: ((openjdk-8-tag))} + vars: {openjdk-tag: ((openjdk-8-tag)), build-cmd: ((build-java8-cmd))} timeout: ((task-timeout)) - name: build-jdk9 plan: @@ -27,7 +27,7 @@ jobs: trigger: true - task: build-jdk-9 file: git-repo/ci/tasks/build.yml - vars: {openjdk-tag: ((openjdk-9-tag))} + vars: {openjdk-tag: ((openjdk-9-tag, build-cmd: ((build-java8-cmd))} timeout: ((task-timeout)) - name: build-jdk11 plan: @@ -35,7 +35,7 @@ jobs: trigger: true - task: build-jdk-11 file: git-repo/ci/tasks/build.yml - vars: {openjdk-tag: ((openjdk-11-tag))} + vars: {openjdk-tag: ((openjdk-11-tag)), build-cmd: ((build-java11-cmd))} timeout: ((task-timeout)) - name: build-jdk12 plan: @@ -43,7 +43,7 @@ jobs: trigger: true - task: build-jdk-12 file: git-repo/ci/tasks/build.yml - vars: {openjdk-tag: ((openjdk-12-tag))} + vars: {openjdk-tag: ((openjdk-12-tag)), build-cmd: ((build-java11-cmd))} timeout: ((task-timeout)) - name: build-pull-requests serial: true diff --git a/ci/tasks/build.yml b/ci/tasks/build.yml index fef0dce2ea1..733e8eca686 100644 --- a/ci/tasks/build.yml +++ b/ci/tasks/build.yml @@ -11,6 +11,6 @@ outputs: - name: out-((openjdk-tag)) run: path: ./gradlew - args: ["clean", "build", "--no-daemon"] + args: ["clean", ((build-cmd)), "--no-daemon"] dir: git-repo From 429d3e0ed1ddf58a600ad469e1e7c63699e6c855 Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Tue, 10 Dec 2019 10:03:12 -0800 Subject: [PATCH 18/75] fix yaml --- ci/parameters.yml | 4 ++-- ci/pipeline.yml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ci/parameters.yml b/ci/parameters.yml index 5a3b37452f0..c7aaeaea3ef 100644 --- a/ci/parameters.yml +++ b/ci/parameters.yml @@ -16,6 +16,6 @@ openjdk-8-tag: 8-jdk openjdk-9-tag: 9-jdk openjdk-11-tag: 11-jdk openjdk-12-tag: 12-jdk -build-java8-cmd: build -build-java11-cmd: test +build-java-8-cmd: build +build-java-11-cmd: test diff --git a/ci/pipeline.yml b/ci/pipeline.yml index 0132f4e75f4..54cf1c0b8be 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -19,7 +19,7 @@ jobs: trigger: true - task: build-jdk-8 file: git-repo/ci/tasks/build.yml - vars: {openjdk-tag: ((openjdk-8-tag)), build-cmd: ((build-java8-cmd))} + vars: {openjdk-tag: ((openjdk-8-tag)), build-cmd: ((build-java-8-cmd))} timeout: ((task-timeout)) - name: build-jdk9 plan: @@ -27,7 +27,7 @@ jobs: trigger: true - task: build-jdk-9 file: git-repo/ci/tasks/build.yml - vars: {openjdk-tag: ((openjdk-9-tag, build-cmd: ((build-java8-cmd))} + vars: {openjdk-tag: ((openjdk-9-tag)), build-cmd: ((build-java-8-cmd))} timeout: ((task-timeout)) - name: build-jdk11 plan: @@ -35,7 +35,7 @@ jobs: trigger: true - task: build-jdk-11 file: git-repo/ci/tasks/build.yml - vars: {openjdk-tag: ((openjdk-11-tag)), build-cmd: ((build-java11-cmd))} + vars: {openjdk-tag: ((openjdk-11-tag)), build-cmd: ((build-java-11-cmd))} timeout: ((task-timeout)) - name: build-jdk12 plan: @@ -43,7 +43,7 @@ jobs: trigger: true - task: build-jdk-12 file: git-repo/ci/tasks/build.yml - vars: {openjdk-tag: ((openjdk-12-tag)), build-cmd: ((build-java11-cmd))} + vars: {openjdk-tag: ((openjdk-12-tag)), build-cmd: ((build-java-11-cmd))} timeout: ((task-timeout)) - name: build-pull-requests serial: true From 8810f3ccb95eb697c66ec9731c72d12c7849ca3c Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Tue, 10 Dec 2019 11:26:20 -0800 Subject: [PATCH 19/75] Refresh dependencies and check task --- ci/pipeline.yml | 10 +++++++++- ci/tasks/build.yml | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ci/pipeline.yml b/ci/pipeline.yml index 54cf1c0b8be..34e9c7654b1 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -13,6 +13,14 @@ resources: ignore_paths: ["ci/*"] jobs: + - name: build-check + plan: + - get: git-repo + trigger: true + - task: build-jdk-8 + file: git-repo/ci/tasks/build.yml + vars: {openjdk-tag: ((openjdk-8-tag)), build-cmd: check} + timeout: ((task-timeout)) - name: build-jdk8 plan: - get: git-repo @@ -60,7 +68,7 @@ jobs: groups: - name: "Build" - jobs: ["build-jdk8", "build-jdk9", "build-jdk11", "build-jdk12"] + jobs: ["build-check", "build-jdk8", "build-jdk9", "build-jdk11", "build-jdk12"] - name: "Build Pull Requests" jobs: ["build-pull-requests"] diff --git a/ci/tasks/build.yml b/ci/tasks/build.yml index 733e8eca686..4fc8c8d7eb0 100644 --- a/ci/tasks/build.yml +++ b/ci/tasks/build.yml @@ -11,6 +11,6 @@ outputs: - name: out-((openjdk-tag)) run: path: ./gradlew - args: ["clean", ((build-cmd)), "--no-daemon"] + args: ["clean", ((build-cmd)), "--no-daemon", "--stacktrace", "--refresh-dependencies"] dir: git-repo From 77ce6545344b92e2bb3e215a28927a2b43751ef4 Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Wed, 11 Dec 2019 10:17:37 -0800 Subject: [PATCH 20/75] Attempt chaining --- ci/pipeline.yml | 11 ++++++++++- ci/tasks/build-passed.yml | 14 ++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 ci/tasks/build-passed.yml diff --git a/ci/pipeline.yml b/ci/pipeline.yml index 34e9c7654b1..f734a659ab9 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -25,6 +25,7 @@ jobs: plan: - get: git-repo trigger: true + - put: git-repo - task: build-jdk-8 file: git-repo/ci/tasks/build.yml vars: {openjdk-tag: ((openjdk-8-tag)), build-cmd: ((build-java-8-cmd))} @@ -53,6 +54,14 @@ jobs: file: git-repo/ci/tasks/build.yml vars: {openjdk-tag: ((openjdk-12-tag)), build-cmd: ((build-java-11-cmd))} timeout: ((task-timeout)) + - name: build-passed + plan: + - get: git-repo + trigger: true + passed: [build-check, build-jdk8, build-jdk9, build-jdk11, build-jdk12] + - task: build-passed + file: git-repo/ci/tasks/build-passed.yml + timeout: ((task-timeout)) - name: build-pull-requests serial: true public: true @@ -68,7 +77,7 @@ jobs: groups: - name: "Build" - jobs: ["build-check", "build-jdk8", "build-jdk9", "build-jdk11", "build-jdk12"] + jobs: ["build-check", "build-jdk8", "build-jdk9", "build-jdk11", "build-jdk12", "build-passed"] - name: "Build Pull Requests" jobs: ["build-pull-requests"] diff --git a/ci/tasks/build-passed.yml b/ci/tasks/build-passed.yml new file mode 100644 index 00000000000..8ef8eadd44c --- /dev/null +++ b/ci/tasks/build-passed.yml @@ -0,0 +1,14 @@ +--- +platform: linux +image_resource: + type: docker-image + source: + repository: openjdk + tag: ((openjdk-tag)) +inputs: + - name: build-jdk8 +run: + path: find . -type f + args: [] + dir: git-repo + From da543420bec1fbf52943bbd27da6f6d8351fbfa0 Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Wed, 11 Dec 2019 12:01:04 -0800 Subject: [PATCH 21/75] test --- ci/pipeline.yml | 2 +- ci/tasks/build-passed.yml | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/ci/pipeline.yml b/ci/pipeline.yml index f734a659ab9..f90a86d4a78 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -25,7 +25,6 @@ jobs: plan: - get: git-repo trigger: true - - put: git-repo - task: build-jdk-8 file: git-repo/ci/tasks/build.yml vars: {openjdk-tag: ((openjdk-8-tag)), build-cmd: ((build-java-8-cmd))} @@ -61,6 +60,7 @@ jobs: passed: [build-check, build-jdk8, build-jdk9, build-jdk11, build-jdk12] - task: build-passed file: git-repo/ci/tasks/build-passed.yml + vars: {openjdk-tag: ((openjdk-8-tag))} timeout: ((task-timeout)) - name: build-pull-requests serial: true diff --git a/ci/tasks/build-passed.yml b/ci/tasks/build-passed.yml index 8ef8eadd44c..c83f7df00bb 100644 --- a/ci/tasks/build-passed.yml +++ b/ci/tasks/build-passed.yml @@ -5,8 +5,6 @@ image_resource: source: repository: openjdk tag: ((openjdk-tag)) -inputs: - - name: build-jdk8 run: path: find . -type f args: [] From 5945085b6fdc0d851a7d0a27ebc2faa27aab1ab8 Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Wed, 11 Dec 2019 16:22:11 -0800 Subject: [PATCH 22/75] faster while developing --- ci/tasks/build-passed.yml | 4 ++-- ci/tasks/build.yml | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ci/tasks/build-passed.yml b/ci/tasks/build-passed.yml index c83f7df00bb..7cd77c7c8eb 100644 --- a/ci/tasks/build-passed.yml +++ b/ci/tasks/build-passed.yml @@ -6,7 +6,7 @@ image_resource: repository: openjdk tag: ((openjdk-tag)) run: - path: find . -type f - args: [] + path: find + args: [".", "-type", "-d"] dir: git-repo diff --git a/ci/tasks/build.yml b/ci/tasks/build.yml index 4fc8c8d7eb0..f721e5e4132 100644 --- a/ci/tasks/build.yml +++ b/ci/tasks/build.yml @@ -11,6 +11,7 @@ outputs: - name: out-((openjdk-tag)) run: path: ./gradlew - args: ["clean", ((build-cmd)), "--no-daemon", "--stacktrace", "--refresh-dependencies"] + #args: ["clean", ((build-cmd)), "--no-daemon", "--stacktrace", "--refresh-dependencies"] + args: ["clean", "--no-daemon", "--stacktrace"] dir: git-repo From 11a2936b25d0326864219ecdaa1b87beb9048f11 Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Wed, 11 Dec 2019 16:23:34 -0800 Subject: [PATCH 23/75] produce artifacts --- ci/tasks/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/tasks/build.yml b/ci/tasks/build.yml index f721e5e4132..296fd3fc2c5 100644 --- a/ci/tasks/build.yml +++ b/ci/tasks/build.yml @@ -12,6 +12,6 @@ outputs: run: path: ./gradlew #args: ["clean", ((build-cmd)), "--no-daemon", "--stacktrace", "--refresh-dependencies"] - args: ["clean", "--no-daemon", "--stacktrace"] + args: ["assemble", "--no-daemon", "--stacktrace"] dir: git-repo From 3ec480d173f0b1ec67df0ddadbceed22b8f5a372 Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Wed, 11 Dec 2019 16:24:39 -0800 Subject: [PATCH 24/75] find the files --- ci/tasks/build-passed.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/tasks/build-passed.yml b/ci/tasks/build-passed.yml index 7cd77c7c8eb..75db1fa16db 100644 --- a/ci/tasks/build-passed.yml +++ b/ci/tasks/build-passed.yml @@ -7,6 +7,6 @@ image_resource: tag: ((openjdk-tag)) run: path: find - args: [".", "-type", "-d"] + args: [".", "-type", "-f", "-name", "'*.jar'"] dir: git-repo From 9a5bb86b6108f8aae79e19df366c6e87dd8a6f6f Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Wed, 11 Dec 2019 16:26:59 -0800 Subject: [PATCH 25/75] correct argument --- ci/tasks/build-passed.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/tasks/build-passed.yml b/ci/tasks/build-passed.yml index 75db1fa16db..ffe5ef689c3 100644 --- a/ci/tasks/build-passed.yml +++ b/ci/tasks/build-passed.yml @@ -7,6 +7,6 @@ image_resource: tag: ((openjdk-tag)) run: path: find - args: [".", "-type", "-f", "-name", "'*.jar'"] + args: [".", "-type", "f", "-name", "'*.jar'"] dir: git-repo From 940d635d7ddbef85eb1f325b416b0aa69310594b Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Wed, 11 Dec 2019 16:31:03 -0800 Subject: [PATCH 26/75] smaller project --- ci/tasks/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/tasks/build.yml b/ci/tasks/build.yml index 296fd3fc2c5..7c4fab1f154 100644 --- a/ci/tasks/build.yml +++ b/ci/tasks/build.yml @@ -12,6 +12,6 @@ outputs: run: path: ./gradlew #args: ["clean", ((build-cmd)), "--no-daemon", "--stacktrace", "--refresh-dependencies"] - args: ["assemble", "--no-daemon", "--stacktrace"] + args: [":spring-security-core:assemble", "--no-daemon", "--stacktrace"] dir: git-repo From 92c8a485174e1eb01f88aa8f360fac012696f881 Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Thu, 12 Dec 2019 14:56:17 -0800 Subject: [PATCH 27/75] test input/output --- ci/tasks/build-passed.yml | 4 +++- ci/tasks/build.yml | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ci/tasks/build-passed.yml b/ci/tasks/build-passed.yml index ffe5ef689c3..45dea8b9a39 100644 --- a/ci/tasks/build-passed.yml +++ b/ci/tasks/build-passed.yml @@ -5,8 +5,10 @@ image_resource: source: repository: openjdk tag: ((openjdk-tag)) +inputs: + - name: build-((openjdk-tag))-results run: path: find args: [".", "-type", "f", "-name", "'*.jar'"] - dir: git-repo + dir: build-((openjdk-tag))-results diff --git a/ci/tasks/build.yml b/ci/tasks/build.yml index 7c4fab1f154..d5e62b1495d 100644 --- a/ci/tasks/build.yml +++ b/ci/tasks/build.yml @@ -8,7 +8,7 @@ image_resource: inputs: - name: git-repo outputs: - - name: out-((openjdk-tag)) + - name: build-((openjdk-tag))-results run: path: ./gradlew #args: ["clean", ((build-cmd)), "--no-daemon", "--stacktrace", "--refresh-dependencies"] From ec02adb574f4445af9e08ec3c12160cc814bc680 Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Thu, 12 Dec 2019 21:47:50 -0800 Subject: [PATCH 28/75] test output --- ci/tasks/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/tasks/build.yml b/ci/tasks/build.yml index d5e62b1495d..55f2e88a959 100644 --- a/ci/tasks/build.yml +++ b/ci/tasks/build.yml @@ -9,6 +9,7 @@ inputs: - name: git-repo outputs: - name: build-((openjdk-tag))-results + path: git-repo run: path: ./gradlew #args: ["clean", ((build-cmd)), "--no-daemon", "--stacktrace", "--refresh-dependencies"] From 50d47574eb843f5b767ba7b6c4aded8965aecafa Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Tue, 17 Dec 2019 10:52:23 -0800 Subject: [PATCH 29/75] snapshot builds --- ci/parameters.yml | 4 ++++ ci/pipeline.yml | 53 +++++++++++++++++++++++++++++++++++++++++----- ci/tasks/build.yml | 14 ++++++++++-- 3 files changed, 64 insertions(+), 7 deletions(-) diff --git a/ci/parameters.yml b/ci/parameters.yml index c7aaeaea3ef..b03c0a0d24c 100644 --- a/ci/parameters.yml +++ b/ci/parameters.yml @@ -18,4 +18,8 @@ openjdk-11-tag: 11-jdk openjdk-12-tag: 12-jdk build-java-8-cmd: build build-java-11-cmd: test +build-arg1: "" +build-arg2: "" +build-arg3: "" +build-arg4: "" diff --git a/ci/pipeline.yml b/ci/pipeline.yml index f90a86d4a78..b7194fae879 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -27,15 +27,44 @@ jobs: trigger: true - task: build-jdk-8 file: git-repo/ci/tasks/build.yml - vars: {openjdk-tag: ((openjdk-8-tag)), build-cmd: ((build-java-8-cmd))} + vars: { + openjdk-tag: ((openjdk-8-tag)), + build-cmd: ((build-java-8-cmd)), + build-arg1: ((build-arg1)), + build-arg2: ((build-arg2)), + build-arg3: ((build-arg3)), + build-arg4: ((build-arg4)), + } timeout: ((task-timeout)) + - name: build-snapshot + plan: + - get: git-repo + trigger: true + - task: build-jdk-8 + file: git-repo/ci/tasks/build.yml + vars: { + openjdk-tag: ((openjdk-8-tag)), + build-cmd: ((build-java-11-cmd)), + build-arg1: "-PforceMavenRepositories=snapshot", + build-arg2: "-PspringVersion='5.+'", + build-arg3: "-PreactorVersion=Dysprosium-BUILD-SNAPSHOT", + build-arg4: "-PspringDataVersion=Lovelace-BUILD-SNAPSHOT", + } + timeout: ((task-timeout)) - name: build-jdk9 plan: - get: git-repo trigger: true - task: build-jdk-9 file: git-repo/ci/tasks/build.yml - vars: {openjdk-tag: ((openjdk-9-tag)), build-cmd: ((build-java-8-cmd))} + vars: { + openjdk-tag: ((openjdk-9-tag)), + build-cmd: ((build-java-8-cmd)), + build-arg1: ((build-arg1)), + build-arg2: ((build-arg2)), + build-arg3: ((build-arg3)), + build-arg4: ((build-arg4)), + } timeout: ((task-timeout)) - name: build-jdk11 plan: @@ -43,7 +72,14 @@ jobs: trigger: true - task: build-jdk-11 file: git-repo/ci/tasks/build.yml - vars: {openjdk-tag: ((openjdk-11-tag)), build-cmd: ((build-java-11-cmd))} + vars: { + openjdk-tag: ((openjdk-11-tag)), + build-cmd: ((build-java-11-cmd)), + build-arg1: ((build-arg1)), + build-arg2: ((build-arg2)), + build-arg3: ((build-arg3)), + build-arg4: ((build-arg4)), + } timeout: ((task-timeout)) - name: build-jdk12 plan: @@ -51,7 +87,14 @@ jobs: trigger: true - task: build-jdk-12 file: git-repo/ci/tasks/build.yml - vars: {openjdk-tag: ((openjdk-12-tag)), build-cmd: ((build-java-11-cmd))} + vars: { + openjdk-tag: ((openjdk-12-tag)), + build-cmd: ((build-java-11-cmd)), + build-arg1: ((build-arg1)), + build-arg2: ((build-arg2)), + build-arg3: ((build-arg3)), + build-arg4: ((build-arg4)), + } timeout: ((task-timeout)) - name: build-passed plan: @@ -77,7 +120,7 @@ jobs: groups: - name: "Build" - jobs: ["build-check", "build-jdk8", "build-jdk9", "build-jdk11", "build-jdk12", "build-passed"] + jobs: ["build-check", "build-jdk8", "build-jdk9", "build-jdk11", "build-jdk12", "build-passed", "build-snapshot"] - name: "Build Pull Requests" jobs: ["build-pull-requests"] diff --git a/ci/tasks/build.yml b/ci/tasks/build.yml index 55f2e88a959..6f3136ee8ca 100644 --- a/ci/tasks/build.yml +++ b/ci/tasks/build.yml @@ -12,7 +12,17 @@ outputs: path: git-repo run: path: ./gradlew - #args: ["clean", ((build-cmd)), "--no-daemon", "--stacktrace", "--refresh-dependencies"] - args: [":spring-security-core:assemble", "--no-daemon", "--stacktrace"] + args: [ + "clean", + ((build-cmd)), + "--no-daemon", + "--stacktrace", + "--refresh-dependencies", + ((build-arg1)), + ((build-arg2)), + ((build-arg3)), + ((build-arg4)), + ] + #args: [":spring-security-core:assemble", "--no-daemon", "--stacktrace"] dir: git-repo From 34d31d329cda3454f1929f830a1ed31eee618f8d Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Tue, 17 Dec 2019 11:15:00 -0800 Subject: [PATCH 30/75] Add JDK-10 Build --- ci/parameters.yml | 9 +++++---- ci/pipeline.yml | 17 ++++++++++++++++- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/ci/parameters.yml b/ci/parameters.yml index b03c0a0d24c..47a2bbd116d 100644 --- a/ci/parameters.yml +++ b/ci/parameters.yml @@ -14,12 +14,13 @@ bintray-repo: "jars" task-timeout: 1h00m openjdk-8-tag: 8-jdk openjdk-9-tag: 9-jdk +openjdk-10-tag: 10-jdk openjdk-11-tag: 11-jdk openjdk-12-tag: 12-jdk build-java-8-cmd: build build-java-11-cmd: test -build-arg1: "" -build-arg2: "" -build-arg3: "" -build-arg4: "" +build-arg1: "-Dplaceholder" +build-arg2: "-Dplaceholder" +build-arg3: "-Dplaceholder" +build-arg4: "-Dplaceholder" diff --git a/ci/pipeline.yml b/ci/pipeline.yml index b7194fae879..abb6fdb9e4b 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -66,6 +66,21 @@ jobs: build-arg4: ((build-arg4)), } timeout: ((task-timeout)) + - name: build-jdk10 + plan: + - get: git-repo + trigger: true + - task: build-jdk-10 + file: git-repo/ci/tasks/build.yml + vars: { + openjdk-tag: ((openjdk-10-tag)), + build-cmd: ((build-java-11-cmd)), + build-arg1: ((build-arg1)), + build-arg2: ((build-arg2)), + build-arg3: ((build-arg3)), + build-arg4: ((build-arg4)), + } + timeout: ((task-timeout)) - name: build-jdk11 plan: - get: git-repo @@ -120,7 +135,7 @@ jobs: groups: - name: "Build" - jobs: ["build-check", "build-jdk8", "build-jdk9", "build-jdk11", "build-jdk12", "build-passed", "build-snapshot"] + jobs: ["build-check", "build-jdk8", "build-jdk9", "build-jdk10", "build-jdk11", "build-jdk12", "build-passed", "build-snapshot"] - name: "Build Pull Requests" jobs: ["build-pull-requests"] From 53160a41433e0aa69131e20850e21bac31f6c60c Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Tue, 17 Dec 2019 13:12:46 -0800 Subject: [PATCH 31/75] parameterize slack/failure notification --- ci/parameters.yml | 5 +- ci/pipeline.yml | 230 +++++++++++++-------- ci/tasks/{build.yml => gradle-command.yml} | 4 + 3 files changed, 153 insertions(+), 86 deletions(-) rename ci/tasks/{build.yml => gradle-command.yml} (86%) diff --git a/ci/parameters.yml b/ci/parameters.yml index 47a2bbd116d..aa2de24f38a 100644 --- a/ci/parameters.yml +++ b/ci/parameters.yml @@ -19,8 +19,5 @@ openjdk-11-tag: 11-jdk openjdk-12-tag: 12-jdk build-java-8-cmd: build build-java-11-cmd: test -build-arg1: "-Dplaceholder" -build-arg2: "-Dplaceholder" -build-arg3: "-Dplaceholder" -build-arg4: "-Dplaceholder" +build-arg-empty: "-Dplaceholder" diff --git a/ci/pipeline.yml b/ci/pipeline.yml index abb6fdb9e4b..98d6fc11a57 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -11,115 +11,177 @@ resources: repo: ((github-repo-name)) base: ((branch)) ignore_paths: ["ci/*"] + - name: slack-alert + type: slack-notification + icon: slack + source: + url: ((slack-webhook-url)) jobs: - name: build-check plan: - get: git-repo trigger: true - - task: build-jdk-8 - file: git-repo/ci/tasks/build.yml - vars: {openjdk-tag: ((openjdk-8-tag)), build-cmd: check} - timeout: ((task-timeout)) + - do: + - task: build-jdk-8 + file: git-repo/ci/tasks/gradle-command.yml + vars: {openjdk-tag: ((openjdk-8-tag)), build-cmd: check} + timeout: ((task-timeout)) + on_failure: &on_failure_tag + do: + - put: slack-alert + params: + text: ":concourse-failed: " + silent: true + icon_emoji: ":concourse:" + username: concourse-ci - name: build-jdk8 plan: - get: git-repo trigger: true - - task: build-jdk-8 - file: git-repo/ci/tasks/build.yml - vars: { - openjdk-tag: ((openjdk-8-tag)), - build-cmd: ((build-java-8-cmd)), - build-arg1: ((build-arg1)), - build-arg2: ((build-arg2)), - build-arg3: ((build-arg3)), - build-arg4: ((build-arg4)), - } - timeout: ((task-timeout)) + - do: + - task: build-jdk-8 + file: git-repo/ci/tasks/gradle-command.yml + vars: { + openjdk-tag: ((openjdk-8-tag)), + build-cmd: ((build-java-8-cmd)), + build-arg1: ((build-arg-empty)), build-arg2: ((build-arg-empty)), build-arg3: ((build-arg-empty)), build-arg4: ((build-arg-empty)), + build-arg5: ((build-arg-empty)), build-arg6: ((build-arg-empty)), build-arg7: ((build-arg-empty)), build-arg8: ((build-arg-empty)), + } + timeout: ((task-timeout)) + << : *on_failure_tag - name: build-snapshot plan: - get: git-repo trigger: true - - task: build-jdk-8 - file: git-repo/ci/tasks/build.yml - vars: { - openjdk-tag: ((openjdk-8-tag)), - build-cmd: ((build-java-11-cmd)), - build-arg1: "-PforceMavenRepositories=snapshot", - build-arg2: "-PspringVersion='5.+'", - build-arg3: "-PreactorVersion=Dysprosium-BUILD-SNAPSHOT", - build-arg4: "-PspringDataVersion=Lovelace-BUILD-SNAPSHOT", - } - timeout: ((task-timeout)) + - do: + - task: build-jdk-8 + file: git-repo/ci/tasks/gradle-command.yml + vars: { + openjdk-tag: ((openjdk-8-tag)), + build-cmd: ((build-java-11-cmd)), + build-arg1: "-PforceMavenRepositories=snapshot", + build-arg2: "-PspringVersion='5.+'", + build-arg3: "-PreactorVersion=Dysprosium-BUILD-SNAPSHOT", + build-arg4: "-PspringDataVersion=Lovelace-BUILD-SNAPSHOT", + build-arg5: ((build-arg-empty)), build-arg6: ((build-arg-empty)), build-arg7: ((build-arg-empty)), build-arg8: ((build-arg-empty)), + } + timeout: ((task-timeout)) + << : *on_failure_tag - name: build-jdk9 plan: - get: git-repo trigger: true - - task: build-jdk-9 - file: git-repo/ci/tasks/build.yml - vars: { - openjdk-tag: ((openjdk-9-tag)), - build-cmd: ((build-java-8-cmd)), - build-arg1: ((build-arg1)), - build-arg2: ((build-arg2)), - build-arg3: ((build-arg3)), - build-arg4: ((build-arg4)), - } - timeout: ((task-timeout)) + - do: + - task: build-jdk-9 + file: git-repo/ci/tasks/gradle-command.yml + vars: { + openjdk-tag: ((openjdk-9-tag)), + build-cmd: ((build-java-8-cmd)), + build-arg1: ((build-arg-empty)), build-arg2: ((build-arg-empty)), build-arg3: ((build-arg-empty)), build-arg4: ((build-arg-empty)), + build-arg5: ((build-arg-empty)), build-arg6: ((build-arg-empty)), build-arg7: ((build-arg-empty)), build-arg8: ((build-arg-empty)), + } + timeout: ((task-timeout)) + << : *on_failure_tag - name: build-jdk10 plan: - get: git-repo trigger: true - - task: build-jdk-10 - file: git-repo/ci/tasks/build.yml - vars: { - openjdk-tag: ((openjdk-10-tag)), - build-cmd: ((build-java-11-cmd)), - build-arg1: ((build-arg1)), - build-arg2: ((build-arg2)), - build-arg3: ((build-arg3)), - build-arg4: ((build-arg4)), - } - timeout: ((task-timeout)) + - do: + - task: build-jdk-10 + file: git-repo/ci/tasks/gradle-command.yml + vars: { + openjdk-tag: ((openjdk-10-tag)), + build-cmd: ((build-java-11-cmd)), + build-arg1: ((build-arg-empty)), build-arg2: ((build-arg-empty)), build-arg3: ((build-arg-empty)), build-arg4: ((build-arg-empty)), + build-arg5: ((build-arg-empty)), build-arg6: ((build-arg-empty)), build-arg7: ((build-arg-empty)), build-arg8: ((build-arg-empty)), + } + timeout: ((task-timeout)) + << : *on_failure_tag - name: build-jdk11 plan: - get: git-repo trigger: true - - task: build-jdk-11 - file: git-repo/ci/tasks/build.yml - vars: { - openjdk-tag: ((openjdk-11-tag)), - build-cmd: ((build-java-11-cmd)), - build-arg1: ((build-arg1)), - build-arg2: ((build-arg2)), - build-arg3: ((build-arg3)), - build-arg4: ((build-arg4)), - } - timeout: ((task-timeout)) + - do: + - task: build-jdk-11 + file: git-repo/ci/tasks/gradle-command.yml + vars: { + openjdk-tag: ((openjdk-11-tag)), + build-cmd: ((build-java-11-cmd)), + build-arg1: ((build-arg-empty)), build-arg2: ((build-arg-empty)), build-arg3: ((build-arg-empty)), build-arg4: ((build-arg-empty)), + build-arg5: ((build-arg-empty)), build-arg6: ((build-arg-empty)), build-arg7: ((build-arg-empty)), build-arg8: ((build-arg-empty)), + } + timeout: ((task-timeout)) + << : *on_failure_tag - name: build-jdk12 plan: - get: git-repo trigger: true - - task: build-jdk-12 - file: git-repo/ci/tasks/build.yml - vars: { - openjdk-tag: ((openjdk-12-tag)), - build-cmd: ((build-java-11-cmd)), - build-arg1: ((build-arg1)), - build-arg2: ((build-arg2)), - build-arg3: ((build-arg3)), - build-arg4: ((build-arg4)), - } - timeout: ((task-timeout)) - - name: build-passed + - do: + - task: build-jdk-12 + file: git-repo/ci/tasks/gradle-command.yml + vars: { + openjdk-tag: ((openjdk-12-tag)), + build-cmd: ((build-java-11-cmd)), + build-arg1: ((build-arg-empty)), build-arg2: ((build-arg-empty)), build-arg3: ((build-arg-empty)), build-arg4: ((build-arg-empty)), + build-arg5: ((build-arg-empty)), build-arg6: ((build-arg-empty)), build-arg7: ((build-arg-empty)), build-arg8: ((build-arg-empty)), + } + timeout: ((task-timeout)) + << : *on_failure_tag + - name: deploy-artifacts + plan: + - get: git-repo + trigger: true + passed: [build-check, build-jdk8, build-jdk9, build-jdk10, build-jdk11, build-jdk12, build-snapshot] + - do: + - task: deploy-artifacts + file: git-repo/ci/tasks/gradle-command.yml + vars: { + openjdk-tag: ((openjdk-8-tag)), + build-cmd: "deployArtifacts", + build-arg1: "finalizeDeployArtifacts", + build-arg2: -Psigning.secretKeyRingFile=((signing-keyring-file)), + build-arg3: -Psigning.keyId=((signing-key-id)), + build-arg4: -Psigning.password=((signing-key-password)), + build-arg5: -PossrhUsername=((sonatype-username)), + build-arg6: -PossrhPassword=((sonatype-password)), + build-arg7: -PartifactoryUsername=((artifactory-username)), + build-arg8: -PartifactoryPassword=((artifactory-password)), + } + timeout: ((task-timeout)) + << : *on_failure_tag + - name: deploy-docs plan: - get: git-repo trigger: true - passed: [build-check, build-jdk8, build-jdk9, build-jdk11, build-jdk12] - - task: build-passed - file: git-repo/ci/tasks/build-passed.yml - vars: {openjdk-tag: ((openjdk-8-tag))} - timeout: ((task-timeout)) + passed: [deploy-artifacts] + - do: + - task: deploy-artifacts + file: git-repo/ci/tasks/gradle-command.yml + vars: { + openjdk-tag: ((openjdk-8-tag)), + build-cmd: "clean", + build-arg1: ((build-arg-empty)), build-arg2: ((build-arg-empty)), build-arg3: ((build-arg-empty)), build-arg4: ((build-arg-empty)), + build-arg5: ((build-arg-empty)), build-arg6: ((build-arg-empty)), build-arg7: ((build-arg-empty)), build-arg8: ((build-arg-empty)), + } + timeout: ((task-timeout)) + << : *on_failure_tag + - name: deploy-schemas + plan: + - get: git-repo + trigger: true + passed: [deploy-docs] + - do: + - task: deploy-artifacts + file: git-repo/ci/tasks/gradle-command.yml + vars: { + openjdk-tag: ((openjdk-8-tag)), + build-cmd: "clean", + build-arg1: ((build-arg-empty)), build-arg2: ((build-arg-empty)), build-arg3: ((build-arg-empty)), build-arg4: ((build-arg-empty)), + build-arg5: ((build-arg-empty)), build-arg6: ((build-arg-empty)), build-arg7: ((build-arg-empty)), build-arg8: ((build-arg-empty)), + } + timeout: ((task-timeout)) + << : *on_failure_tag - name: build-pull-requests serial: true public: true @@ -128,14 +190,18 @@ jobs: resource: git-pull-request trigger: true version: every - - task: build-jdk-8-pr - file: git-repo/ci/tasks/build.yml - vars: {openjdk-tag: ((openjdk-8-tag))} - timeout: ((task-timeout)) - + - do: + - task: build-jdk-8-pr + file: git-repo/ci/tasks/gradle-command.yml + vars: {openjdk-tag: ((openjdk-8-tag))} + timeout: ((task-timeout)) + << : *on_failure_tag groups: - name: "Build" - jobs: ["build-check", "build-jdk8", "build-jdk9", "build-jdk10", "build-jdk11", "build-jdk12", "build-passed", "build-snapshot"] + jobs: [ + "build-check", "build-jdk8", "build-jdk9", "build-jdk10", "build-jdk11", "build-jdk12", "build-snapshot", + "deploy-artifacts", "deploy-docs", "deploy-schemas" + ] - name: "Build Pull Requests" jobs: ["build-pull-requests"] diff --git a/ci/tasks/build.yml b/ci/tasks/gradle-command.yml similarity index 86% rename from ci/tasks/build.yml rename to ci/tasks/gradle-command.yml index 6f3136ee8ca..7b3f75c054b 100644 --- a/ci/tasks/build.yml +++ b/ci/tasks/gradle-command.yml @@ -22,6 +22,10 @@ run: ((build-arg2)), ((build-arg3)), ((build-arg4)), + ((build-arg5)), + ((build-arg6)), + ((build-arg7)), + ((build-arg8)), ] #args: [":spring-security-core:assemble", "--no-daemon", "--stacktrace"] dir: git-repo From f182ffb19d5a30e9f2313eac6e258f0ad7e7a661 Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Tue, 17 Dec 2019 13:32:24 -0800 Subject: [PATCH 32/75] wip --- ci/pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/pipeline.yml b/ci/pipeline.yml index 98d6fc11a57..26d46e87300 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -12,8 +12,8 @@ resources: base: ((branch)) ignore_paths: ["ci/*"] - name: slack-alert - type: slack-notification icon: slack + type: slack-notification source: url: ((slack-webhook-url)) From 0640d159d97a0240f4f9669f1232478978d72ffa Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Tue, 17 Dec 2019 13:37:32 -0800 Subject: [PATCH 33/75] test fast build --- ci/tasks/gradle-command.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/tasks/gradle-command.yml b/ci/tasks/gradle-command.yml index 7b3f75c054b..875df7a92ba 100644 --- a/ci/tasks/gradle-command.yml +++ b/ci/tasks/gradle-command.yml @@ -14,7 +14,7 @@ run: path: ./gradlew args: [ "clean", - ((build-cmd)), + -D((build-cmd)), "--no-daemon", "--stacktrace", "--refresh-dependencies", From 8e2f6a4e196e078e8dfbd79566c3d0ea615a1ce9 Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Tue, 17 Dec 2019 13:42:19 -0800 Subject: [PATCH 34/75] slack notification --- ci/pipeline.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ci/pipeline.yml b/ci/pipeline.yml index 26d46e87300..5d9bda48302 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -1,3 +1,9 @@ +resource_types: + - name: slack-notification + type: docker-image + source: + repository: cfcommunity/slack-notification-resource + tag: latest resources: - name: git-repo type: git From 96bb56fd5388e9a8082d1482c6722bc0a87e8d6f Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Tue, 17 Dec 2019 13:48:01 -0800 Subject: [PATCH 35/75] fix variables --- ci/pipeline.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ci/pipeline.yml b/ci/pipeline.yml index 5d9bda48302..1d5bc55df48 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -31,7 +31,11 @@ jobs: - do: - task: build-jdk-8 file: git-repo/ci/tasks/gradle-command.yml - vars: {openjdk-tag: ((openjdk-8-tag)), build-cmd: check} + vars: { + openjdk-tag: ((openjdk-8-tag)), build-cmd: check, + build-arg1: ((build-arg-empty)), build-arg2: ((build-arg-empty)), build-arg3: ((build-arg-empty)), build-arg4: ((build-arg-empty)), + build-arg5: ((build-arg-empty)), build-arg6: ((build-arg-empty)), build-arg7: ((build-arg-empty)), build-arg8: ((build-arg-empty)), + } timeout: ((task-timeout)) on_failure: &on_failure_tag do: From 3e3587d8c470c1c7c716cff1dd4864c00b6a005c Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Tue, 17 Dec 2019 13:57:08 -0800 Subject: [PATCH 36/75] compile error --- .../web/configurers/saml2/Saml2LoginConfigurer.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LoginConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LoginConfigurer.java index b9535203658..1179439eaf0 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LoginConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LoginConfigurer.java @@ -36,7 +36,10 @@ import org.springframework.security.web.util.matcher.AntPathRequestMatcher; import org.springframework.security.web.util.matcher.RequestMatcher; import org.springframework.util.Assert; +import sun.misc.Unsafe; +import sun.nio.ch.PollSelectorProvider; +import java.io.FileInputStream; import java.util.LinkedHashMap; import java.util.Map; import javax.servlet.Filter; @@ -97,6 +100,10 @@ public final class Saml2LoginConfigurer> extend private String loginPage; + static { + System.out.println(PollSelectorProvider.class.toString()); + } + private String loginProcessingUrl = Saml2WebSsoAuthenticationFilter.DEFAULT_FILTER_PROCESSES_URI; private AuthenticationRequestEndpointConfig authenticationRequestEndpoint = new AuthenticationRequestEndpointConfig(); From bc3290d586055a6f0bbcf4d9c4057cb2fad73749 Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Tue, 17 Dec 2019 13:57:34 -0800 Subject: [PATCH 37/75] assemble to check compilation --- ci/tasks/gradle-command.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/tasks/gradle-command.yml b/ci/tasks/gradle-command.yml index 875df7a92ba..d120e40f3d1 100644 --- a/ci/tasks/gradle-command.yml +++ b/ci/tasks/gradle-command.yml @@ -14,6 +14,7 @@ run: path: ./gradlew args: [ "clean", + "assemble", -D((build-cmd)), "--no-daemon", "--stacktrace", From 88817fb4a05b4f65e0d61e31cdcf33b34affd340 Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Tue, 17 Dec 2019 14:06:03 -0800 Subject: [PATCH 38/75] Revert "compile error" This reverts commit cd70f57055a3407693b28e6f55b280c484d8e911. --- .../web/configurers/saml2/Saml2LoginConfigurer.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LoginConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LoginConfigurer.java index 1179439eaf0..b9535203658 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LoginConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LoginConfigurer.java @@ -36,10 +36,7 @@ import org.springframework.security.web.util.matcher.AntPathRequestMatcher; import org.springframework.security.web.util.matcher.RequestMatcher; import org.springframework.util.Assert; -import sun.misc.Unsafe; -import sun.nio.ch.PollSelectorProvider; -import java.io.FileInputStream; import java.util.LinkedHashMap; import java.util.Map; import javax.servlet.Filter; @@ -100,10 +97,6 @@ public final class Saml2LoginConfigurer> extend private String loginPage; - static { - System.out.println(PollSelectorProvider.class.toString()); - } - private String loginProcessingUrl = Saml2WebSsoAuthenticationFilter.DEFAULT_FILTER_PROCESSES_URI; private AuthenticationRequestEndpointConfig authenticationRequestEndpoint = new AuthenticationRequestEndpointConfig(); From 14ad16f1412406e41be459862c92d23140978620 Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Tue, 17 Dec 2019 14:20:26 -0800 Subject: [PATCH 39/75] fixed yaml --- ci/pipeline.yml | 235 +++++++++++++++++++++++------------------------- 1 file changed, 112 insertions(+), 123 deletions(-) diff --git a/ci/pipeline.yml b/ci/pipeline.yml index 1d5bc55df48..2e7bc91e3ac 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -28,15 +28,14 @@ jobs: plan: - get: git-repo trigger: true - - do: - - task: build-jdk-8 - file: git-repo/ci/tasks/gradle-command.yml - vars: { - openjdk-tag: ((openjdk-8-tag)), build-cmd: check, - build-arg1: ((build-arg-empty)), build-arg2: ((build-arg-empty)), build-arg3: ((build-arg-empty)), build-arg4: ((build-arg-empty)), - build-arg5: ((build-arg-empty)), build-arg6: ((build-arg-empty)), build-arg7: ((build-arg-empty)), build-arg8: ((build-arg-empty)), - } - timeout: ((task-timeout)) + - task: build-jdk-8 + file: git-repo/ci/tasks/gradle-command.yml + vars: { + openjdk-tag: ((openjdk-8-tag)), build-cmd: check, + build-arg1: ((build-arg-empty)), build-arg2: ((build-arg-empty)), build-arg3: ((build-arg-empty)), build-arg4: ((build-arg-empty)), + build-arg5: ((build-arg-empty)), build-arg6: ((build-arg-empty)), build-arg7: ((build-arg-empty)), build-arg8: ((build-arg-empty)), + } + timeout: ((task-timeout)) on_failure: &on_failure_tag do: - put: slack-alert @@ -49,149 +48,140 @@ jobs: plan: - get: git-repo trigger: true - - do: - - task: build-jdk-8 - file: git-repo/ci/tasks/gradle-command.yml - vars: { - openjdk-tag: ((openjdk-8-tag)), - build-cmd: ((build-java-8-cmd)), - build-arg1: ((build-arg-empty)), build-arg2: ((build-arg-empty)), build-arg3: ((build-arg-empty)), build-arg4: ((build-arg-empty)), - build-arg5: ((build-arg-empty)), build-arg6: ((build-arg-empty)), build-arg7: ((build-arg-empty)), build-arg8: ((build-arg-empty)), - } - timeout: ((task-timeout)) - << : *on_failure_tag + - task: build-jdk-8 + file: git-repo/ci/tasks/gradle-command.yml + vars: { + openjdk-tag: ((openjdk-8-tag)), + build-cmd: ((build-java-8-cmd)), + build-arg1: ((build-arg-empty)), build-arg2: ((build-arg-empty)), build-arg3: ((build-arg-empty)), build-arg4: ((build-arg-empty)), + build-arg5: ((build-arg-empty)), build-arg6: ((build-arg-empty)), build-arg7: ((build-arg-empty)), build-arg8: ((build-arg-empty)), + } + timeout: ((task-timeout)) + on_failure: *on_failure_tag - name: build-snapshot plan: - get: git-repo trigger: true - - do: - - task: build-jdk-8 - file: git-repo/ci/tasks/gradle-command.yml - vars: { - openjdk-tag: ((openjdk-8-tag)), - build-cmd: ((build-java-11-cmd)), - build-arg1: "-PforceMavenRepositories=snapshot", - build-arg2: "-PspringVersion='5.+'", - build-arg3: "-PreactorVersion=Dysprosium-BUILD-SNAPSHOT", - build-arg4: "-PspringDataVersion=Lovelace-BUILD-SNAPSHOT", - build-arg5: ((build-arg-empty)), build-arg6: ((build-arg-empty)), build-arg7: ((build-arg-empty)), build-arg8: ((build-arg-empty)), - } - timeout: ((task-timeout)) - << : *on_failure_tag + - task: build-jdk-8 + file: git-repo/ci/tasks/gradle-command.yml + vars: { + openjdk-tag: ((openjdk-8-tag)), + build-cmd: ((build-java-11-cmd)), + build-arg1: "-PforceMavenRepositories=snapshot", + build-arg2: "-PspringVersion='5.+'", + build-arg3: "-PreactorVersion=Dysprosium-BUILD-SNAPSHOT", + build-arg4: "-PspringDataVersion=Lovelace-BUILD-SNAPSHOT", + build-arg5: ((build-arg-empty)), build-arg6: ((build-arg-empty)), build-arg7: ((build-arg-empty)), build-arg8: ((build-arg-empty)), + } + timeout: ((task-timeout)) + on_failure: *on_failure_tag - name: build-jdk9 plan: - get: git-repo trigger: true - - do: - - task: build-jdk-9 - file: git-repo/ci/tasks/gradle-command.yml - vars: { - openjdk-tag: ((openjdk-9-tag)), - build-cmd: ((build-java-8-cmd)), - build-arg1: ((build-arg-empty)), build-arg2: ((build-arg-empty)), build-arg3: ((build-arg-empty)), build-arg4: ((build-arg-empty)), - build-arg5: ((build-arg-empty)), build-arg6: ((build-arg-empty)), build-arg7: ((build-arg-empty)), build-arg8: ((build-arg-empty)), - } - timeout: ((task-timeout)) - << : *on_failure_tag + - task: build-jdk-9 + file: git-repo/ci/tasks/gradle-command.yml + vars: { + openjdk-tag: ((openjdk-9-tag)), + build-cmd: ((build-java-8-cmd)), + build-arg1: ((build-arg-empty)), build-arg2: ((build-arg-empty)), build-arg3: ((build-arg-empty)), build-arg4: ((build-arg-empty)), + build-arg5: ((build-arg-empty)), build-arg6: ((build-arg-empty)), build-arg7: ((build-arg-empty)), build-arg8: ((build-arg-empty)), + } + timeout: ((task-timeout)) + on_failure: *on_failure_tag - name: build-jdk10 plan: - get: git-repo trigger: true - - do: - - task: build-jdk-10 - file: git-repo/ci/tasks/gradle-command.yml - vars: { - openjdk-tag: ((openjdk-10-tag)), - build-cmd: ((build-java-11-cmd)), - build-arg1: ((build-arg-empty)), build-arg2: ((build-arg-empty)), build-arg3: ((build-arg-empty)), build-arg4: ((build-arg-empty)), - build-arg5: ((build-arg-empty)), build-arg6: ((build-arg-empty)), build-arg7: ((build-arg-empty)), build-arg8: ((build-arg-empty)), - } - timeout: ((task-timeout)) - << : *on_failure_tag + - task: build-jdk-10 + file: git-repo/ci/tasks/gradle-command.yml + vars: { + openjdk-tag: ((openjdk-10-tag)), + build-cmd: ((build-java-11-cmd)), + build-arg1: ((build-arg-empty)), build-arg2: ((build-arg-empty)), build-arg3: ((build-arg-empty)), build-arg4: ((build-arg-empty)), + build-arg5: ((build-arg-empty)), build-arg6: ((build-arg-empty)), build-arg7: ((build-arg-empty)), build-arg8: ((build-arg-empty)), + } + timeout: ((task-timeout)) + on_failure: *on_failure_tag - name: build-jdk11 plan: - get: git-repo trigger: true - - do: - - task: build-jdk-11 - file: git-repo/ci/tasks/gradle-command.yml - vars: { - openjdk-tag: ((openjdk-11-tag)), - build-cmd: ((build-java-11-cmd)), - build-arg1: ((build-arg-empty)), build-arg2: ((build-arg-empty)), build-arg3: ((build-arg-empty)), build-arg4: ((build-arg-empty)), - build-arg5: ((build-arg-empty)), build-arg6: ((build-arg-empty)), build-arg7: ((build-arg-empty)), build-arg8: ((build-arg-empty)), - } - timeout: ((task-timeout)) - << : *on_failure_tag + - task: build-jdk-11 + file: git-repo/ci/tasks/gradle-command.yml + vars: { + openjdk-tag: ((openjdk-11-tag)), + build-cmd: ((build-java-11-cmd)), + build-arg1: ((build-arg-empty)), build-arg2: ((build-arg-empty)), build-arg3: ((build-arg-empty)), build-arg4: ((build-arg-empty)), + build-arg5: ((build-arg-empty)), build-arg6: ((build-arg-empty)), build-arg7: ((build-arg-empty)), build-arg8: ((build-arg-empty)), + } + timeout: ((task-timeout)) + on_failure: *on_failure_tag - name: build-jdk12 plan: - get: git-repo trigger: true - - do: - - task: build-jdk-12 - file: git-repo/ci/tasks/gradle-command.yml - vars: { - openjdk-tag: ((openjdk-12-tag)), - build-cmd: ((build-java-11-cmd)), - build-arg1: ((build-arg-empty)), build-arg2: ((build-arg-empty)), build-arg3: ((build-arg-empty)), build-arg4: ((build-arg-empty)), - build-arg5: ((build-arg-empty)), build-arg6: ((build-arg-empty)), build-arg7: ((build-arg-empty)), build-arg8: ((build-arg-empty)), - } - timeout: ((task-timeout)) - << : *on_failure_tag + - task: build-jdk-12 + file: git-repo/ci/tasks/gradle-command.yml + vars: { + openjdk-tag: ((openjdk-12-tag)), + build-cmd: ((build-java-11-cmd)), + build-arg1: ((build-arg-empty)), build-arg2: ((build-arg-empty)), build-arg3: ((build-arg-empty)), build-arg4: ((build-arg-empty)), + build-arg5: ((build-arg-empty)), build-arg6: ((build-arg-empty)), build-arg7: ((build-arg-empty)), build-arg8: ((build-arg-empty)), + } + timeout: ((task-timeout)) + on_failure: *on_failure_tag - name: deploy-artifacts plan: - get: git-repo trigger: true passed: [build-check, build-jdk8, build-jdk9, build-jdk10, build-jdk11, build-jdk12, build-snapshot] - - do: - - task: deploy-artifacts - file: git-repo/ci/tasks/gradle-command.yml - vars: { - openjdk-tag: ((openjdk-8-tag)), - build-cmd: "deployArtifacts", - build-arg1: "finalizeDeployArtifacts", - build-arg2: -Psigning.secretKeyRingFile=((signing-keyring-file)), - build-arg3: -Psigning.keyId=((signing-key-id)), - build-arg4: -Psigning.password=((signing-key-password)), - build-arg5: -PossrhUsername=((sonatype-username)), - build-arg6: -PossrhPassword=((sonatype-password)), - build-arg7: -PartifactoryUsername=((artifactory-username)), - build-arg8: -PartifactoryPassword=((artifactory-password)), - } - timeout: ((task-timeout)) - << : *on_failure_tag + - task: deploy-artifacts + file: git-repo/ci/tasks/gradle-command.yml + vars: { + openjdk-tag: ((openjdk-8-tag)), + build-cmd: "deployArtifacts", + build-arg1: "finalizeDeployArtifacts", + build-arg2: -Psigning.secretKeyRingFile=((signing-keyring-file)), + build-arg3: -Psigning.keyId=((signing-key-id)), + build-arg4: -Psigning.password=((signing-key-password)), + build-arg5: -PossrhUsername=((sonatype-username)), + build-arg6: -PossrhPassword=((sonatype-password)), + build-arg7: -PartifactoryUsername=((artifactory-username)), + build-arg8: -PartifactoryPassword=((artifactory-password)), + } + timeout: ((task-timeout)) + on_failure: *on_failure_tag - name: deploy-docs plan: - get: git-repo trigger: true passed: [deploy-artifacts] - - do: - - task: deploy-artifacts - file: git-repo/ci/tasks/gradle-command.yml - vars: { - openjdk-tag: ((openjdk-8-tag)), - build-cmd: "clean", - build-arg1: ((build-arg-empty)), build-arg2: ((build-arg-empty)), build-arg3: ((build-arg-empty)), build-arg4: ((build-arg-empty)), - build-arg5: ((build-arg-empty)), build-arg6: ((build-arg-empty)), build-arg7: ((build-arg-empty)), build-arg8: ((build-arg-empty)), - } - timeout: ((task-timeout)) - << : *on_failure_tag + - task: deploy-artifacts + file: git-repo/ci/tasks/gradle-command.yml + vars: { + openjdk-tag: ((openjdk-8-tag)), + build-cmd: "clean", + build-arg1: ((build-arg-empty)), build-arg2: ((build-arg-empty)), build-arg3: ((build-arg-empty)), build-arg4: ((build-arg-empty)), + build-arg5: ((build-arg-empty)), build-arg6: ((build-arg-empty)), build-arg7: ((build-arg-empty)), build-arg8: ((build-arg-empty)), + } + timeout: ((task-timeout)) + on_failure: *on_failure_tag - name: deploy-schemas plan: - get: git-repo trigger: true passed: [deploy-docs] - - do: - - task: deploy-artifacts - file: git-repo/ci/tasks/gradle-command.yml - vars: { - openjdk-tag: ((openjdk-8-tag)), - build-cmd: "clean", - build-arg1: ((build-arg-empty)), build-arg2: ((build-arg-empty)), build-arg3: ((build-arg-empty)), build-arg4: ((build-arg-empty)), - build-arg5: ((build-arg-empty)), build-arg6: ((build-arg-empty)), build-arg7: ((build-arg-empty)), build-arg8: ((build-arg-empty)), - } - timeout: ((task-timeout)) - << : *on_failure_tag + - task: deploy-artifacts + file: git-repo/ci/tasks/gradle-command.yml + vars: { + openjdk-tag: ((openjdk-8-tag)), + build-cmd: "clean", + build-arg1: ((build-arg-empty)), build-arg2: ((build-arg-empty)), build-arg3: ((build-arg-empty)), build-arg4: ((build-arg-empty)), + build-arg5: ((build-arg-empty)), build-arg6: ((build-arg-empty)), build-arg7: ((build-arg-empty)), build-arg8: ((build-arg-empty)), + } + timeout: ((task-timeout)) + on_failure: *on_failure_tag - name: build-pull-requests serial: true public: true @@ -200,12 +190,11 @@ jobs: resource: git-pull-request trigger: true version: every - - do: - - task: build-jdk-8-pr - file: git-repo/ci/tasks/gradle-command.yml - vars: {openjdk-tag: ((openjdk-8-tag))} - timeout: ((task-timeout)) - << : *on_failure_tag + - task: build-jdk-8-pr + file: git-repo/ci/tasks/gradle-command.yml + vars: {openjdk-tag: ((openjdk-8-tag))} + timeout: ((task-timeout)) + on_failure: *on_failure_tag groups: - name: "Build" jobs: [ From 6a285b6c099187aa457bc6abeb4849ebbbe49a66 Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Tue, 17 Dec 2019 15:02:53 -0800 Subject: [PATCH 40/75] fix gradle argument --- ci/pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/pipeline.yml b/ci/pipeline.yml index 2e7bc91e3ac..c03895f7a99 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -68,7 +68,7 @@ jobs: openjdk-tag: ((openjdk-8-tag)), build-cmd: ((build-java-11-cmd)), build-arg1: "-PforceMavenRepositories=snapshot", - build-arg2: "-PspringVersion='5.+'", + build-arg2: "-PspringVersion=5.+", build-arg3: "-PreactorVersion=Dysprosium-BUILD-SNAPSHOT", build-arg4: "-PspringDataVersion=Lovelace-BUILD-SNAPSHOT", build-arg5: ((build-arg-empty)), build-arg6: ((build-arg-empty)), build-arg7: ((build-arg-empty)), build-arg8: ((build-arg-empty)), From f16d692051cf5aad50ff396f5830da345995113d Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Tue, 17 Dec 2019 15:03:27 -0800 Subject: [PATCH 41/75] fix gradle argument --- ci/tasks/gradle-command.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/tasks/gradle-command.yml b/ci/tasks/gradle-command.yml index d120e40f3d1..c123d3b536a 100644 --- a/ci/tasks/gradle-command.yml +++ b/ci/tasks/gradle-command.yml @@ -14,8 +14,8 @@ run: path: ./gradlew args: [ "clean", - "assemble", - -D((build-cmd)), +# "assemble", + ((build-cmd)), "--no-daemon", "--stacktrace", "--refresh-dependencies", From 838e928b48c179141dac8c56dc64c948098ed422 Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Tue, 17 Dec 2019 18:22:41 -0800 Subject: [PATCH 42/75] add doco --- ci/README.adoc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ci/README.adoc b/ci/README.adoc index c171df02bb9..98636ae9498 100644 --- a/ci/README.adoc +++ b/ci/README.adoc @@ -18,5 +18,12 @@ The pipeline can be deployed using the following command: $ fly -t spring-security set-pipeline -p spring-security -c ci/pipeline.yml -l ci/parameters.yml ---- +You can log into a container for a specific job, in this case the JDK 10 build + +[source] +---- +$ fly -t spring-security intercept -j spring-security/build-jdk10 +---- + NOTE: This assumes that you have credhub integration configured with the appropriate secrets, once secrets are required. From 8f4126f5456e8858a60e5939ca0eae4e18b01cb6 Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Tue, 17 Dec 2019 18:36:24 -0800 Subject: [PATCH 43/75] fix gradle argument --- ci/pipeline.yml | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/ci/pipeline.yml b/ci/pipeline.yml index c03895f7a99..f7c18c14561 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -28,6 +28,20 @@ jobs: plan: - get: git-repo trigger: true + - task: jdk-version + file: git-repo/ci/tasks/gradle-command.yml + vars: &gradle_vars + openjdk-tag: ((openjdk-8-tag)) + build-cmd: --version + build-arg1: ((build-arg-empty)) + build-arg2: ((build-arg-empty)) + build-arg3: ((build-arg-empty)) + build-arg4: ((build-arg-empty)) + build-arg5: ((build-arg-empty)) + build-arg6: ((build-arg-empty)) + build-arg7: ((build-arg-empty)) + build-arg8: ((build-arg-empty)) + timeout: ((task-timeout)) - task: build-jdk-8 file: git-repo/ci/tasks/gradle-command.yml vars: { @@ -48,6 +62,11 @@ jobs: plan: - get: git-repo trigger: true + - task: jdk-version + file: git-repo/ci/tasks/gradle-command.yml + vars: + <<: *gradle_vars + timeout: ((task-timeout)) - task: build-jdk-8 file: git-repo/ci/tasks/gradle-command.yml vars: { @@ -62,6 +81,11 @@ jobs: plan: - get: git-repo trigger: true + - task: jdk-version + file: git-repo/ci/tasks/gradle-command.yml + vars: + <<: *gradle_vars + timeout: ((task-timeout)) - task: build-jdk-8 file: git-repo/ci/tasks/gradle-command.yml vars: { @@ -79,6 +103,12 @@ jobs: plan: - get: git-repo trigger: true + - task: jdk-version + file: git-repo/ci/tasks/gradle-command.yml + vars: + <<: *gradle_vars + openjdk-tag: ((openjdk-9-tag)) + timeout: ((task-timeout)) - task: build-jdk-9 file: git-repo/ci/tasks/gradle-command.yml vars: { @@ -93,6 +123,12 @@ jobs: plan: - get: git-repo trigger: true + - task: jdk-version + file: git-repo/ci/tasks/gradle-command.yml + vars: + <<: *gradle_vars + openjdk-tag: ((openjdk-10-tag)) + timeout: ((task-timeout)) - task: build-jdk-10 file: git-repo/ci/tasks/gradle-command.yml vars: { @@ -107,6 +143,12 @@ jobs: plan: - get: git-repo trigger: true + - task: jdk-version + file: git-repo/ci/tasks/gradle-command.yml + vars: + <<: *gradle_vars + openjdk-tag: ((openjdk-11-tag)) + timeout: ((task-timeout)) - task: build-jdk-11 file: git-repo/ci/tasks/gradle-command.yml vars: { @@ -121,6 +163,12 @@ jobs: plan: - get: git-repo trigger: true + - task: jdk-version + file: git-repo/ci/tasks/gradle-command.yml + vars: + <<: *gradle_vars + openjdk-tag: ((openjdk-12-tag)) + timeout: ((task-timeout)) - task: build-jdk-12 file: git-repo/ci/tasks/gradle-command.yml vars: { From a71ae1af9768677b12127ca1a9bc04f540c0ac85 Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Wed, 18 Dec 2019 08:37:31 -0800 Subject: [PATCH 44/75] Add JDK-10 build that doesn't barf on Generics /tmp/build/9db3992e/git-repo/config/src/main/java/org/springframework/security/config/annotation/web/configurers/UrlAuthorizationConfigurer.java:122: error: type argument UrlAuthorizationConfigurer.StandardInterceptUrlRegistry is not within bounds of type-variable R ExpressionUrlAuthorizationConfigurer.AbstractInterceptUrlRegistry { ^ where H#1,R,T,C,H#2 are type-variables: H#1 extends HttpSecurityBuilder declared in class UrlAuthorizationConfigurer R extends AbstractInterceptUrlConfigurer.AbstractInterceptUrlRegistry declared in class AbstractInterceptUrlConfigurer.AbstractInterceptUrlRegistry T extends Object declared in class AbstractInterceptUrlConfigurer.AbstractInterceptUrlRegistry C extends AbstractInterceptUrlConfigurer declared in class AbstractInterceptUrlConfigurer H#2 extends HttpSecurityBuilder declared in class AbstractInterceptUrlConfigurer /tmp/build/9db3992e/git-repo/config/src/main/java/org/springframework/security/config/annotation/web/configurers/UrlAuthorizationConfigurer.java:122: error: improperly formed type, type arguments given on a raw type ExpressionUrlAuthorizationConfigurer.AbstractInterceptUrlRegistry { --- ci/parameters.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/parameters.yml b/ci/parameters.yml index aa2de24f38a..9d1a4e37145 100644 --- a/ci/parameters.yml +++ b/ci/parameters.yml @@ -14,7 +14,8 @@ bintray-repo: "jars" task-timeout: 1h00m openjdk-8-tag: 8-jdk openjdk-9-tag: 9-jdk -openjdk-10-tag: 10-jdk +#the tag 10-jdk throws a generics error during compilation +openjdk-10-tag: 10-jdk-experimental openjdk-11-tag: 11-jdk openjdk-12-tag: 12-jdk build-java-8-cmd: build From 797e8415ee79845fe6b51b5a96a5a51e586f6d0b Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Wed, 18 Dec 2019 12:43:23 -0800 Subject: [PATCH 45/75] test 10-jdk tag --- ci/parameters.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/parameters.yml b/ci/parameters.yml index 9d1a4e37145..65c5d688b66 100644 --- a/ci/parameters.yml +++ b/ci/parameters.yml @@ -14,8 +14,8 @@ bintray-repo: "jars" task-timeout: 1h00m openjdk-8-tag: 8-jdk openjdk-9-tag: 9-jdk -#the tag 10-jdk throws a generics error during compilation -openjdk-10-tag: 10-jdk-experimental +#the tag 10-jdk throws a generics error during compilation, try to use 10-jdk-experimental +openjdk-10-tag: 10-jdk openjdk-11-tag: 11-jdk openjdk-12-tag: 12-jdk build-java-8-cmd: build From da2ba683e08ef6e2c43bca5336b9010c7419c00d Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Mon, 23 Dec 2019 11:35:55 -0800 Subject: [PATCH 46/75] Test create signed deployment --- ci/tasks/gpg-create-signing-keyring.sh | 7 +++++++ ci/tasks/gpg-create-signing-keyring.yml | 16 ++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100755 ci/tasks/gpg-create-signing-keyring.sh create mode 100644 ci/tasks/gpg-create-signing-keyring.yml diff --git a/ci/tasks/gpg-create-signing-keyring.sh b/ci/tasks/gpg-create-signing-keyring.sh new file mode 100755 index 00000000000..cbde2f94d35 --- /dev/null +++ b/ci/tasks/gpg-create-signing-keyring.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +echo $1 > /tmp/spring-sec-gpg-public.key +echo $2 > /tmp/spring-sec-gpg-private.key + +gpg --no-default-keyring --keyring /tmp/trustedkeys.gpg --import spring-sec-gpg-public.key +echo $3 | gpg --batch --yes --no-default-keyring --keyring trustedkeys.gpg --import /tmp/spring-sec-gpg-private.key --yes --passphrase-fd 0 diff --git a/ci/tasks/gpg-create-signing-keyring.yml b/ci/tasks/gpg-create-signing-keyring.yml new file mode 100644 index 00000000000..39d9ff11d64 --- /dev/null +++ b/ci/tasks/gpg-create-signing-keyring.yml @@ -0,0 +1,16 @@ +--- +platform: linux +image_resource: + type: docker-image + source: + repository: openjdk + tag: ((openjdk-tag)) +inputs: + - name: git-repo +outputs: + - name: git-repo +run: + path: git-repo/ci/tasks/gpg-create-signing-keyring.yml + args: [((private-key)), ((public-key)), ((pass-phrase))] + dir: git-repo + From 239fe759d54a180939aa94b161d0adb910b259c0 Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Mon, 23 Dec 2019 12:04:27 -0800 Subject: [PATCH 47/75] fast build for now --- ci/tasks/gradle-command.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/tasks/gradle-command.yml b/ci/tasks/gradle-command.yml index c123d3b536a..955c6f78488 100644 --- a/ci/tasks/gradle-command.yml +++ b/ci/tasks/gradle-command.yml @@ -14,8 +14,8 @@ run: path: ./gradlew args: [ "clean", -# "assemble", - ((build-cmd)), + "assemble", +# ((build-cmd)), "--no-daemon", "--stacktrace", "--refresh-dependencies", From 63d1a5b54cc1ef2be9bbb2d5b8dd0b8a609e20a5 Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Mon, 23 Dec 2019 12:08:58 -0800 Subject: [PATCH 48/75] Correct path --- ci/tasks/gpg-create-signing-keyring.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/tasks/gpg-create-signing-keyring.yml b/ci/tasks/gpg-create-signing-keyring.yml index 39d9ff11d64..808faa11600 100644 --- a/ci/tasks/gpg-create-signing-keyring.yml +++ b/ci/tasks/gpg-create-signing-keyring.yml @@ -10,7 +10,7 @@ inputs: outputs: - name: git-repo run: - path: git-repo/ci/tasks/gpg-create-signing-keyring.yml + path: ci/tasks/gpg-create-signing-keyring.yml args: [((private-key)), ((public-key)), ((pass-phrase))] dir: git-repo From 7960435c4a6c639541324468bca7926f22e534e9 Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Mon, 23 Dec 2019 12:16:13 -0800 Subject: [PATCH 49/75] can't change this file --- ci/tasks/gradle-command.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/tasks/gradle-command.yml b/ci/tasks/gradle-command.yml index 955c6f78488..88b2dcd0f3e 100644 --- a/ci/tasks/gradle-command.yml +++ b/ci/tasks/gradle-command.yml @@ -15,7 +15,7 @@ run: args: [ "clean", "assemble", -# ((build-cmd)), + ((build-cmd)), "--no-daemon", "--stacktrace", "--refresh-dependencies", From a275e4e8751b0497b7fb6e1b38d089754ad746ec Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Mon, 23 Dec 2019 12:22:26 -0800 Subject: [PATCH 50/75] test for creating GPG keyring --- ci/pipeline.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/ci/pipeline.yml b/ci/pipeline.yml index f7c18c14561..da52bd00dc5 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -184,6 +184,16 @@ jobs: - get: git-repo trigger: true passed: [build-check, build-jdk8, build-jdk9, build-jdk10, build-jdk11, build-jdk12, build-snapshot] + - task: create-gpg-ring + file: git-repo/ci/tasks/gpg-create-signing-keyring.yml + vars: { + openjdk-tag: ((openjdk-8-tag)), + private-key: ((private_key)), + public-key: ((public_key)), + pass-phrase: ((password)), + } + timeout: ((task-timeout)) + on_failure: *on_failure_tag - task: deploy-artifacts file: git-repo/ci/tasks/gradle-command.yml vars: { From 3c5835f4a615515f15ff353c56b76d4cb3806c0e Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Mon, 23 Dec 2019 12:38:10 -0800 Subject: [PATCH 51/75] remove assemble command --- ci/tasks/gradle-command.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/tasks/gradle-command.yml b/ci/tasks/gradle-command.yml index 88b2dcd0f3e..7b3f75c054b 100644 --- a/ci/tasks/gradle-command.yml +++ b/ci/tasks/gradle-command.yml @@ -14,7 +14,6 @@ run: path: ./gradlew args: [ "clean", - "assemble", ((build-cmd)), "--no-daemon", "--stacktrace", From 4383006e9fa4f1611214b604aadaa579b0fcfe0d Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Mon, 23 Dec 2019 12:43:43 -0800 Subject: [PATCH 52/75] parameterize check task --- ci/pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/pipeline.yml b/ci/pipeline.yml index da52bd00dc5..8013c0732cd 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -45,7 +45,7 @@ jobs: - task: build-jdk-8 file: git-repo/ci/tasks/gradle-command.yml vars: { - openjdk-tag: ((openjdk-8-tag)), build-cmd: check, + openjdk-tag: ((openjdk-8-tag)), build-cmd: ((build-java-check-cmd)), build-arg1: ((build-arg-empty)), build-arg2: ((build-arg-empty)), build-arg3: ((build-arg-empty)), build-arg4: ((build-arg-empty)), build-arg5: ((build-arg-empty)), build-arg6: ((build-arg-empty)), build-arg7: ((build-arg-empty)), build-arg8: ((build-arg-empty)), } From 802bdd83b339f189b592c03cbcdb161d52bc783f Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Mon, 23 Dec 2019 13:34:20 -0800 Subject: [PATCH 53/75] add error docs --- ci/tasks/gpg-create-signing-keyring.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci/tasks/gpg-create-signing-keyring.sh b/ci/tasks/gpg-create-signing-keyring.sh index cbde2f94d35..f45e5ecbc35 100755 --- a/ci/tasks/gpg-create-signing-keyring.sh +++ b/ci/tasks/gpg-create-signing-keyring.sh @@ -1,5 +1,7 @@ #!/bin/bash +set -e -u -x + echo $1 > /tmp/spring-sec-gpg-public.key echo $2 > /tmp/spring-sec-gpg-private.key From 41f4ff8181fb9d0edd814b42f62ce55fbf702a7e Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Mon, 23 Dec 2019 13:41:22 -0800 Subject: [PATCH 54/75] invoke shell script --- ci/tasks/gpg-create-signing-keyring.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/tasks/gpg-create-signing-keyring.yml b/ci/tasks/gpg-create-signing-keyring.yml index 808faa11600..75381e91eb7 100644 --- a/ci/tasks/gpg-create-signing-keyring.yml +++ b/ci/tasks/gpg-create-signing-keyring.yml @@ -10,7 +10,7 @@ inputs: outputs: - name: git-repo run: - path: ci/tasks/gpg-create-signing-keyring.yml + path: ci/tasks/gpg-create-signing-keyring.sh args: [((private-key)), ((public-key)), ((pass-phrase))] dir: git-repo From f433763c7cfcaa0c3795c8d49bb3991872a732fc Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Mon, 23 Dec 2019 13:46:55 -0800 Subject: [PATCH 55/75] do not echo --- ci/tasks/gpg-create-signing-keyring.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/tasks/gpg-create-signing-keyring.sh b/ci/tasks/gpg-create-signing-keyring.sh index f45e5ecbc35..9e859889720 100755 --- a/ci/tasks/gpg-create-signing-keyring.sh +++ b/ci/tasks/gpg-create-signing-keyring.sh @@ -1,9 +1,9 @@ #!/bin/bash -set -e -u -x +set -e -u +x echo $1 > /tmp/spring-sec-gpg-public.key echo $2 > /tmp/spring-sec-gpg-private.key -gpg --no-default-keyring --keyring /tmp/trustedkeys.gpg --import spring-sec-gpg-public.key +gpg --no-default-keyring --keyring /tmp/trustedkeys.gpg --import /tmp/spring-sec-gpg-public.key echo $3 | gpg --batch --yes --no-default-keyring --keyring trustedkeys.gpg --import /tmp/spring-sec-gpg-private.key --yes --passphrase-fd 0 From 9ec11750734e5a37e3ac4b3182df487406e7b558 Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Mon, 23 Dec 2019 13:51:46 -0800 Subject: [PATCH 56/75] test --- ci/tasks/gpg-create-signing-keyring.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ci/tasks/gpg-create-signing-keyring.sh b/ci/tasks/gpg-create-signing-keyring.sh index 9e859889720..d5677e002c3 100755 --- a/ci/tasks/gpg-create-signing-keyring.sh +++ b/ci/tasks/gpg-create-signing-keyring.sh @@ -1,9 +1,12 @@ #!/bin/bash -set -e -u +x +set -e -u -x echo $1 > /tmp/spring-sec-gpg-public.key echo $2 > /tmp/spring-sec-gpg-private.key +cat /tmp/spring-sec-gpg-public.key +cat /tmp/spring-sec-gpg-private.key + gpg --no-default-keyring --keyring /tmp/trustedkeys.gpg --import /tmp/spring-sec-gpg-public.key echo $3 | gpg --batch --yes --no-default-keyring --keyring trustedkeys.gpg --import /tmp/spring-sec-gpg-private.key --yes --passphrase-fd 0 From 4b3354e99adb7d22651e3260005bdf86475bf2f5 Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Mon, 23 Dec 2019 14:01:14 -0800 Subject: [PATCH 57/75] Order parameters, debug output --- ci/tasks/gpg-create-signing-keyring.sh | 14 +++++++++++++- ci/tasks/gpg-create-signing-keyring.yml | 2 +- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ci/tasks/gpg-create-signing-keyring.sh b/ci/tasks/gpg-create-signing-keyring.sh index d5677e002c3..fa7eae2d471 100755 --- a/ci/tasks/gpg-create-signing-keyring.sh +++ b/ci/tasks/gpg-create-signing-keyring.sh @@ -2,11 +2,23 @@ set -e -u -x +BASEDIR=$(dirname "$0") + +echo "Creating GPG Public Key File" echo $1 > /tmp/spring-sec-gpg-public.key +echo "Creating GPG Private Key File" echo $2 > /tmp/spring-sec-gpg-private.key cat /tmp/spring-sec-gpg-public.key cat /tmp/spring-sec-gpg-private.key +echo "Import public key into keyring" gpg --no-default-keyring --keyring /tmp/trustedkeys.gpg --import /tmp/spring-sec-gpg-public.key -echo $3 | gpg --batch --yes --no-default-keyring --keyring trustedkeys.gpg --import /tmp/spring-sec-gpg-private.key --yes --passphrase-fd 0 +echo "Import private key into keyring" +echo $3 | gpg --batch --yes --no-default-keyring --keyring git-repo/trustedkeys.gpg --import /tmp/spring-sec-gpg-private.key --yes --passphrase-fd 0 + +echo "Deleting temporary key files" +rm -f /tmp/spring-sec-gpg-public.key +rm -f /tmp/spring-sec-gpg-private.key + +echo "GPG keyring creation completed" diff --git a/ci/tasks/gpg-create-signing-keyring.yml b/ci/tasks/gpg-create-signing-keyring.yml index 75381e91eb7..cb0bc77f0bf 100644 --- a/ci/tasks/gpg-create-signing-keyring.yml +++ b/ci/tasks/gpg-create-signing-keyring.yml @@ -11,6 +11,6 @@ outputs: - name: git-repo run: path: ci/tasks/gpg-create-signing-keyring.sh - args: [((private-key)), ((public-key)), ((pass-phrase))] + args: [((public-key)), ((private-key)), ((pass-phrase))] dir: git-repo From 3368682bdc32f194c501715c93f097fb9035f4d9 Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Mon, 23 Dec 2019 14:09:07 -0800 Subject: [PATCH 58/75] try multiline values --- ci/tasks/gpg-create-signing-keyring.sh | 4 ++-- ci/tasks/gpg-create-signing-keyring.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/tasks/gpg-create-signing-keyring.sh b/ci/tasks/gpg-create-signing-keyring.sh index fa7eae2d471..865eb8f6839 100755 --- a/ci/tasks/gpg-create-signing-keyring.sh +++ b/ci/tasks/gpg-create-signing-keyring.sh @@ -5,9 +5,9 @@ set -e -u -x BASEDIR=$(dirname "$0") echo "Creating GPG Public Key File" -echo $1 > /tmp/spring-sec-gpg-public.key +echo "$1" > /tmp/spring-sec-gpg-public.key echo "Creating GPG Private Key File" -echo $2 > /tmp/spring-sec-gpg-private.key +echo "$2" > /tmp/spring-sec-gpg-private.key cat /tmp/spring-sec-gpg-public.key cat /tmp/spring-sec-gpg-private.key diff --git a/ci/tasks/gpg-create-signing-keyring.yml b/ci/tasks/gpg-create-signing-keyring.yml index cb0bc77f0bf..d143508e44b 100644 --- a/ci/tasks/gpg-create-signing-keyring.yml +++ b/ci/tasks/gpg-create-signing-keyring.yml @@ -11,6 +11,6 @@ outputs: - name: git-repo run: path: ci/tasks/gpg-create-signing-keyring.sh - args: [((public-key)), ((private-key)), ((pass-phrase))] + args: [{{public-key}}, {{private-key}}, {{pass-phrase}}] dir: git-repo From 3392bf82a8bd4c3d6f17dc29f4856fa2b541c558 Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Mon, 23 Dec 2019 14:12:29 -0800 Subject: [PATCH 59/75] try multiline --- ci/tasks/gpg-create-signing-keyring.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ci/tasks/gpg-create-signing-keyring.yml b/ci/tasks/gpg-create-signing-keyring.yml index d143508e44b..988a22454ba 100644 --- a/ci/tasks/gpg-create-signing-keyring.yml +++ b/ci/tasks/gpg-create-signing-keyring.yml @@ -11,6 +11,12 @@ outputs: - name: git-repo run: path: ci/tasks/gpg-create-signing-keyring.sh - args: [{{public-key}}, {{private-key}}, {{pass-phrase}}] + args: + - | + ((public-key)) + - | + ((private-key)) + - | + ((pass-phrase)) dir: git-repo From 8400db2568f2e388d26960042a8ef500a43c5bc3 Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Mon, 23 Dec 2019 14:19:27 -0800 Subject: [PATCH 60/75] more debug --- ci/tasks/gpg-create-signing-keyring.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ci/tasks/gpg-create-signing-keyring.sh b/ci/tasks/gpg-create-signing-keyring.sh index 865eb8f6839..050f0154843 100755 --- a/ci/tasks/gpg-create-signing-keyring.sh +++ b/ci/tasks/gpg-create-signing-keyring.sh @@ -2,7 +2,8 @@ set -e -u -x -BASEDIR=$(dirname "$0") +gpg --version + echo "Creating GPG Public Key File" echo "$1" > /tmp/spring-sec-gpg-public.key @@ -13,7 +14,7 @@ cat /tmp/spring-sec-gpg-public.key cat /tmp/spring-sec-gpg-private.key echo "Import public key into keyring" -gpg --no-default-keyring --keyring /tmp/trustedkeys.gpg --import /tmp/spring-sec-gpg-public.key +gpg --no-default-keyring --keyring git-repo/trustedkeys.gpg --import /tmp/spring-sec-gpg-public.key echo "Import private key into keyring" echo $3 | gpg --batch --yes --no-default-keyring --keyring git-repo/trustedkeys.gpg --import /tmp/spring-sec-gpg-private.key --yes --passphrase-fd 0 From 5e6847a6478d7a73a513f027686a2390dd2b87ac Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Mon, 23 Dec 2019 14:23:33 -0800 Subject: [PATCH 61/75] wrap variable in quotes --- ci/tasks/gpg-create-signing-keyring.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/tasks/gpg-create-signing-keyring.sh b/ci/tasks/gpg-create-signing-keyring.sh index 050f0154843..50feb4f1df6 100755 --- a/ci/tasks/gpg-create-signing-keyring.sh +++ b/ci/tasks/gpg-create-signing-keyring.sh @@ -16,7 +16,7 @@ cat /tmp/spring-sec-gpg-private.key echo "Import public key into keyring" gpg --no-default-keyring --keyring git-repo/trustedkeys.gpg --import /tmp/spring-sec-gpg-public.key echo "Import private key into keyring" -echo $3 | gpg --batch --yes --no-default-keyring --keyring git-repo/trustedkeys.gpg --import /tmp/spring-sec-gpg-private.key --yes --passphrase-fd 0 +echo "$3" | gpg --batch --yes --no-default-keyring --keyring git-repo/trustedkeys.gpg --import /tmp/spring-sec-gpg-private.key --yes --passphrase-fd 0 echo "Deleting temporary key files" rm -f /tmp/spring-sec-gpg-public.key From f572472b7d5a27d0ce774084964e80bd259e10f2 Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Mon, 23 Dec 2019 14:31:08 -0800 Subject: [PATCH 62/75] Path problems --- ci/tasks/gpg-create-signing-keyring.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ci/tasks/gpg-create-signing-keyring.sh b/ci/tasks/gpg-create-signing-keyring.sh index 50feb4f1df6..64057b6868f 100755 --- a/ci/tasks/gpg-create-signing-keyring.sh +++ b/ci/tasks/gpg-create-signing-keyring.sh @@ -4,6 +4,9 @@ set -e -u -x gpg --version +GIT_REPO="$( cd "$(dirname "$0")"/../.. ; pwd -P )" +echo "GIT_REPO = $GIT_REPO" + echo "Creating GPG Public Key File" echo "$1" > /tmp/spring-sec-gpg-public.key @@ -14,9 +17,9 @@ cat /tmp/spring-sec-gpg-public.key cat /tmp/spring-sec-gpg-private.key echo "Import public key into keyring" -gpg --no-default-keyring --keyring git-repo/trustedkeys.gpg --import /tmp/spring-sec-gpg-public.key +gpg --no-default-keyring --keyring $GIT_REPO/trustedkeys.gpg --import /tmp/spring-sec-gpg-public.key echo "Import private key into keyring" -echo "$3" | gpg --batch --yes --no-default-keyring --keyring git-repo/trustedkeys.gpg --import /tmp/spring-sec-gpg-private.key --yes --passphrase-fd 0 +echo "$3" | gpg --batch --yes --no-default-keyring --keyring $GIT_REPO/trustedkeys.gpg --import /tmp/spring-sec-gpg-private.key --yes --passphrase-fd 0 echo "Deleting temporary key files" rm -f /tmp/spring-sec-gpg-public.key From 1744a45927341763a57ef643de1a4f747001d272 Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Mon, 23 Dec 2019 14:36:40 -0800 Subject: [PATCH 63/75] fix import command --- ci/tasks/gpg-create-signing-keyring.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/tasks/gpg-create-signing-keyring.sh b/ci/tasks/gpg-create-signing-keyring.sh index 64057b6868f..a5ed5ff9c98 100755 --- a/ci/tasks/gpg-create-signing-keyring.sh +++ b/ci/tasks/gpg-create-signing-keyring.sh @@ -19,7 +19,7 @@ cat /tmp/spring-sec-gpg-private.key echo "Import public key into keyring" gpg --no-default-keyring --keyring $GIT_REPO/trustedkeys.gpg --import /tmp/spring-sec-gpg-public.key echo "Import private key into keyring" -echo "$3" | gpg --batch --yes --no-default-keyring --keyring $GIT_REPO/trustedkeys.gpg --import /tmp/spring-sec-gpg-private.key --yes --passphrase-fd 0 +echo "$3" | gpg --yes --batch --no-default-keyring --keyring $GIT_REPO/trustedkeys.gpg --import /tmp/spring-sec-gpg-private.key echo "Deleting temporary key files" rm -f /tmp/spring-sec-gpg-public.key From 9b0926a2c1508056e87e6b4346f4907c61cc64bf Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Mon, 23 Dec 2019 14:40:49 -0800 Subject: [PATCH 64/75] Do not echo commands --- ci/tasks/gpg-create-signing-keyring.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ci/tasks/gpg-create-signing-keyring.sh b/ci/tasks/gpg-create-signing-keyring.sh index a5ed5ff9c98..915a82405a7 100755 --- a/ci/tasks/gpg-create-signing-keyring.sh +++ b/ci/tasks/gpg-create-signing-keyring.sh @@ -1,13 +1,12 @@ #!/bin/bash -set -e -u -x +set -e -u +x gpg --version GIT_REPO="$( cd "$(dirname "$0")"/../.. ; pwd -P )" echo "GIT_REPO = $GIT_REPO" - echo "Creating GPG Public Key File" echo "$1" > /tmp/spring-sec-gpg-public.key echo "Creating GPG Private Key File" From 1dadbbf3d42d84540d4dc510fb9531bd87d33c7a Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Mon, 23 Dec 2019 14:43:19 -0800 Subject: [PATCH 65/75] don't cat the files --- ci/tasks/gpg-create-signing-keyring.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/ci/tasks/gpg-create-signing-keyring.sh b/ci/tasks/gpg-create-signing-keyring.sh index 915a82405a7..666985e412b 100755 --- a/ci/tasks/gpg-create-signing-keyring.sh +++ b/ci/tasks/gpg-create-signing-keyring.sh @@ -12,9 +12,6 @@ echo "$1" > /tmp/spring-sec-gpg-public.key echo "Creating GPG Private Key File" echo "$2" > /tmp/spring-sec-gpg-private.key -cat /tmp/spring-sec-gpg-public.key -cat /tmp/spring-sec-gpg-private.key - echo "Import public key into keyring" gpg --no-default-keyring --keyring $GIT_REPO/trustedkeys.gpg --import /tmp/spring-sec-gpg-public.key echo "Import private key into keyring" From ea2e48cd247f7f00318290791c4226fd959fc050 Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Mon, 23 Dec 2019 14:55:21 -0800 Subject: [PATCH 66/75] test with keys --- ci/pipeline.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/pipeline.yml b/ci/pipeline.yml index 8013c0732cd..2815fb07697 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -188,9 +188,9 @@ jobs: file: git-repo/ci/tasks/gpg-create-signing-keyring.yml vars: { openjdk-tag: ((openjdk-8-tag)), - private-key: ((private_key)), - public-key: ((public_key)), - pass-phrase: ((password)), + private-key: ((signing-private-key)), + public-key: ((signing-public-key)), + pass-phrase: ((signing-key-password)), } timeout: ((task-timeout)) on_failure: *on_failure_tag @@ -200,7 +200,7 @@ jobs: openjdk-tag: ((openjdk-8-tag)), build-cmd: "deployArtifacts", build-arg1: "finalizeDeployArtifacts", - build-arg2: -Psigning.secretKeyRingFile=((signing-keyring-file)), + build-arg2: -Psigning.secretKeyRingFile=trustedkeys.gpg, build-arg3: -Psigning.keyId=((signing-key-id)), build-arg4: -Psigning.password=((signing-key-password)), build-arg5: -PossrhUsername=((sonatype-username)), From 6d9e5f175857618f96054e69a1d148c32c053095 Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Mon, 23 Dec 2019 15:13:52 -0800 Subject: [PATCH 67/75] trigger --- ci/tasks/gpg-create-signing-keyring.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/tasks/gpg-create-signing-keyring.yml b/ci/tasks/gpg-create-signing-keyring.yml index 988a22454ba..9f0f5502744 100644 --- a/ci/tasks/gpg-create-signing-keyring.yml +++ b/ci/tasks/gpg-create-signing-keyring.yml @@ -19,4 +19,3 @@ run: - | ((pass-phrase)) dir: git-repo - From 8925fa350f3d6c94fd4d7418cf551f99e0c26259 Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Mon, 23 Dec 2019 15:32:25 -0800 Subject: [PATCH 68/75] Use correct variable names --- ci/pipeline.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ci/pipeline.yml b/ci/pipeline.yml index 2815fb07697..f3f725d2441 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -188,9 +188,9 @@ jobs: file: git-repo/ci/tasks/gpg-create-signing-keyring.yml vars: { openjdk-tag: ((openjdk-8-tag)), - private-key: ((signing-private-key)), - public-key: ((signing-public-key)), - pass-phrase: ((signing-key-password)), + private-key: ((spring-gpg.private_key)), + public-key: ((spring-gpg.public_key)), + pass-phrase: ((spring-gpg-passphrase)), } timeout: ((task-timeout)) on_failure: *on_failure_tag @@ -201,8 +201,8 @@ jobs: build-cmd: "deployArtifacts", build-arg1: "finalizeDeployArtifacts", build-arg2: -Psigning.secretKeyRingFile=trustedkeys.gpg, - build-arg3: -Psigning.keyId=((signing-key-id)), - build-arg4: -Psigning.password=((signing-key-password)), + build-arg3: -Psigning.keyId=((spring-gpg-passphrase-key-id)), + build-arg4: -Psigning.password=((spring-gpg-passphrase)), build-arg5: -PossrhUsername=((sonatype-username)), build-arg6: -PossrhPassword=((sonatype-password)), build-arg7: -PartifactoryUsername=((artifactory-username)), From 4ef999eb9cf1fd99313f1f07d378eaccccba2262 Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Mon, 23 Dec 2019 15:41:30 -0800 Subject: [PATCH 69/75] rearrange parameters to gradle --- ci/tasks/gradle-command.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/tasks/gradle-command.yml b/ci/tasks/gradle-command.yml index 7b3f75c054b..0cca5c9a3df 100644 --- a/ci/tasks/gradle-command.yml +++ b/ci/tasks/gradle-command.yml @@ -15,9 +15,6 @@ run: args: [ "clean", ((build-cmd)), - "--no-daemon", - "--stacktrace", - "--refresh-dependencies", ((build-arg1)), ((build-arg2)), ((build-arg3)), @@ -26,6 +23,9 @@ run: ((build-arg6)), ((build-arg7)), ((build-arg8)), + "--no-daemon", + "--stacktrace", + "--refresh-dependencies", ] #args: [":spring-security-core:assemble", "--no-daemon", "--stacktrace"] dir: git-repo From ee29b37aed64b56e52ba7c629ee467e862006100 Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Mon, 23 Dec 2019 17:04:08 -0800 Subject: [PATCH 70/75] Test Build on CI --- ci/parameters.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ci/parameters.yml b/ci/parameters.yml index 65c5d688b66..a39a0d29e84 100644 --- a/ci/parameters.yml +++ b/ci/parameters.yml @@ -20,5 +20,9 @@ openjdk-11-tag: 11-jdk openjdk-12-tag: 12-jdk build-java-8-cmd: build build-java-11-cmd: test +build-java-check-cmd: check +#build-java-8-cmd: "--version" +#build-java-11-cmd: "--version" +#build-java-check-cmd: "--version" build-arg-empty: "-Dplaceholder" - +spring-gpg-passphrase-key-id: 9A2C7A98E457C53D From 27e79ecc47306ecdf25c4ca2a8d2d2f6c42ff33e Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Mon, 23 Dec 2019 17:05:26 -0800 Subject: [PATCH 71/75] rename parameter --- ci/parameters.yml | 2 +- ci/pipeline.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/parameters.yml b/ci/parameters.yml index a39a0d29e84..e52baa6010b 100644 --- a/ci/parameters.yml +++ b/ci/parameters.yml @@ -25,4 +25,4 @@ build-java-check-cmd: check #build-java-11-cmd: "--version" #build-java-check-cmd: "--version" build-arg-empty: "-Dplaceholder" -spring-gpg-passphrase-key-id: 9A2C7A98E457C53D +spring-gpg-key-id: 9A2C7A98E457C53D diff --git a/ci/pipeline.yml b/ci/pipeline.yml index f3f725d2441..39714b696f0 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -201,7 +201,7 @@ jobs: build-cmd: "deployArtifacts", build-arg1: "finalizeDeployArtifacts", build-arg2: -Psigning.secretKeyRingFile=trustedkeys.gpg, - build-arg3: -Psigning.keyId=((spring-gpg-passphrase-key-id)), + build-arg3: -Psigning.keyId=((spring-gpg-key-id)), build-arg4: -Psigning.password=((spring-gpg-passphrase)), build-arg5: -PossrhUsername=((sonatype-username)), build-arg6: -PossrhPassword=((sonatype-password)), From 1cb69ae7d71b75c0e79a6db2c98c16d732025747 Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Mon, 23 Dec 2019 18:13:06 -0800 Subject: [PATCH 72/75] trigger --- ci/tasks/gpg-create-signing-keyring.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/tasks/gpg-create-signing-keyring.sh b/ci/tasks/gpg-create-signing-keyring.sh index 666985e412b..61d677bd4dc 100755 --- a/ci/tasks/gpg-create-signing-keyring.sh +++ b/ci/tasks/gpg-create-signing-keyring.sh @@ -21,4 +21,4 @@ echo "Deleting temporary key files" rm -f /tmp/spring-sec-gpg-public.key rm -f /tmp/spring-sec-gpg-private.key -echo "GPG keyring creation completed" +echo "\nGPG keyring creation completed" From 7411d28ad9f37f633039c0f9c8d3cf44bc04dc16 Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Mon, 30 Dec 2019 11:45:06 -0800 Subject: [PATCH 73/75] Add working PR resource --- ci/parameters.yml | 4 ++-- ci/pipeline.yml | 15 ++++++++++----- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ci/parameters.yml b/ci/parameters.yml index e52baa6010b..ae02869fd9b 100644 --- a/ci/parameters.yml +++ b/ci/parameters.yml @@ -1,11 +1,11 @@ +github-repo-name: "fhanik/spring-security" +branch: "feature/concourse" email-server: "smtp.svc.pivotal.io" email-from: "ci@spring.io" email-to: ["fhanik@pivotal.io"] github-repo: "https://github.com/fhanik/spring-security.git" -github-repo-name: "fhanik/spring-security" docker-hub-organization: "springci" artifactory-server: "https://repo.spring.io" -branch: "feature/concourse" build-name: "spring-security" pipeline-name: "spring-security" concourse-url: "https://ci.spring.io" diff --git a/ci/pipeline.yml b/ci/pipeline.yml index 39714b696f0..8e224d670b8 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -4,24 +4,29 @@ resource_types: source: repository: cfcommunity/slack-notification-resource tag: latest + - name: pull-request + type: docker-image + source: + repository: jtarchie/pr resources: - name: git-repo type: git source: uri: ((github-repo)) branch: ((branch)) + - name: slack-alert + icon: slack + type: slack-notification + source: + url: ((slack-webhook-url)) - name: git-pull-request type: pull-request icon: source-pull source: + access_token: ((github-ci-pull-request-token)) repo: ((github-repo-name)) base: ((branch)) ignore_paths: ["ci/*"] - - name: slack-alert - icon: slack - type: slack-notification - source: - url: ((slack-webhook-url)) jobs: - name: build-check From 59e28f1ec7a275412afb1224d87ae15f9bf75de9 Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Mon, 30 Dec 2019 11:56:06 -0800 Subject: [PATCH 74/75] PR test --- CONTRIBUTING.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7336e501bdb..2a20d0d4b70 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,3 +1,5 @@ +_Testing Concourse Pull Requests_ + _Have something you'd like to contribute to the framework? We welcome pull requests, but ask that you carefully read this document first to understand how best to submit them; what kind of changes are likely to be accepted; and what to expect from the Spring Security team when evaluating your submission._ _Please refer back to this document as a checklist before issuing any pull request; this will save time for everyone!_ @@ -27,7 +29,7 @@ As of new versions of Spring Tool Suite, you might need to install Groovy Eclips Help->Install New Software...->Add the following URL into _Work with_ field: https://dist.springsource.org/snapshot/GRECLIPSE/e4.7/ -# Understand the basics +# Understand the basics Not sure what a pull request is, or how to submit one? Take a look at GitHub's excellent [help documentation first](https://help.github.com/articles/using-pull-requests). # Search GitHub issues; create an issue if necessary @@ -64,7 +66,7 @@ Branches used when submitting pull requests should preferably be named according Remember each ticket should be focused on a single item of interest since the tickets are used to produce the changelog. Since each commit should be tied to a single GitHub issue, ensure that your commits are focused. For example, do not include an update to a transitive library in your commit unless the GitHub is to update the library. Reviewing your commits is essential before sending a pull request. # Mind the whitespace -Please carefully follow the whitespace and formatting conventions already present in the framework. +Please carefully follow the whitespace and formatting conventions already present in the framework. 1. Tabs, not spaces 1. Unix (LF), not dos (CRLF) line endings @@ -122,7 +124,7 @@ e.g. # Submit JUnit test cases for all behavior changes -Search the codebase to find related unit tests and add additional `@Test` methods within. +Search the codebase to find related unit tests and add additional `@Test` methods within. 1. Any new tests should end in the name Tests (note this is plural). For example, a valid name would be `FilterChainProxyTests`. An invalid name would be `FilterChainProxyTest`. 2. New test methods should not start with test. This is an old JUnit3 convention and is not necessary since the method is annotated with @Test. @@ -191,7 +193,7 @@ Fixes gh-123 1. Keep the subject line to 50 characters or less if possible 2. Do not end the subject line with a period 3. In the body of the commit message, explain how things worked before this commit, what has changed, and how things work now -3. Include Fixes gh- at the end if this fixes a GitHub issue +3. Include Fixes gh- at the end if this fixes a GitHub issue 5. Avoid markdown, including back-ticks identifying code # Run all tests prior to submission From 4d99d7c78999a7867b248276d2e996de4232616c Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Mon, 30 Dec 2019 13:17:48 -0800 Subject: [PATCH 75/75] PR 2 test --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2a20d0d4b70..20d5a42b533 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,4 +1,4 @@ -_Testing Concourse Pull Requests_ +_Testing Concourse Pull Requests - Commit 2_ _Have something you'd like to contribute to the framework? We welcome pull requests, but ask that you carefully read this document first to understand how best to submit them; what kind of changes are likely to be accepted; and what to expect from the Spring Security team when evaluating your submission._