From 90de8a084c4639e5ea871e8bd370434dc01be8f2 Mon Sep 17 00:00:00 2001 From: Steven Terhar Date: Tue, 7 Jul 2020 15:35:10 +0000 Subject: [PATCH 01/10] Update GitLab to the 13.1.3 Security Release --- Dockerfile | 2 +- Jenkinsfile | 2 +- build-scripts/build.sh | 2 +- download.yaml | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index d5abba4..a0d7f18 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG GITLAB_VERSION=v13.1.1-ubi8 +ARG GITLAB_VERSION=v13.1.3-ubi8 ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082 ARG BASE_IMAGE=redhat/ubi/ubi8 diff --git a/Jenkinsfile b/Jenkinsfile index 1a0b4cb..08a04e7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,2 +1,2 @@ @Library('DCCSCR@master') _ -dccscrPipeline(version: "13.1.1-development") +dccscrPipeline(version: "13.1.3") diff --git a/build-scripts/build.sh b/build-scripts/build.sh index f803d52..e27d40b 100755 --- a/build-scripts/build.sh +++ b/build-scripts/build.sh @@ -4,7 +4,7 @@ set -euxo pipefail -TAG=${1:-13.1.1} +TAG=${1:-13.1.3} REPOSITORY=${2:-} DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/download.yaml b/download.yaml index 84b7000..6b33820 100644 --- a/download.yaml +++ b/download.yaml @@ -1,6 +1,6 @@ resources: - - url: "https://gitlab-ubi.s3.us-east-2.amazonaws.com/ubi8-build-dependencies-v13.1.1-ubi8.tar" - filename: "ubi8-build-dependencies-v13.1.1-ubi8.tar" # could be named whatever you want + - url: "https://gitlab-ubi.s3.us-east-2.amazonaws.com/ubi8-build-dependencies-v13.1.3-ubi8.tar" + filename: "ubi8-build-dependencies-v13.1.3-ubi8.tar" # could be named whatever you want validation: type: "sha256" - value: "3f53617949bb8c50b5bb3bb728b0e2b7d849220b0406722bd781c2cb97325f1d" + value: "073b5f9677cb1493955f7ecd122b0ecf9f49d72e1bd082b1f5affdc95fe9e4b5" -- GitLab From 5275c06a3cb53e52a51c3e8a7515db97959a8183 Mon Sep 17 00:00:00 2001 From: alfontaine Date: Mon, 20 Jul 2020 10:47:11 -0600 Subject: [PATCH 02/10] gitlab update script --- Jenkinsfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 08a04e7..e69de29 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,2 +0,0 @@ -@Library('DCCSCR@master') _ -dccscrPipeline(version: "13.1.3") -- GitLab From 5df2cb65ff565cc9b5cf4df5655852c633d29a84 Mon Sep 17 00:00:00 2001 From: Al Fontaine Date: Mon, 20 Jul 2020 16:46:54 +0000 Subject: [PATCH 03/10] Update Jenkinsfile --- Jenkinsfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index e69de29..ee4b880 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -0,0 +1,2 @@ +@Library('DCCSCR@master') _ +dccscrPipeline(version: "13.1.3") \ No newline at end of file -- GitLab From f0276fb4e296528e0f09f5a893308d072ea70cf8 Mon Sep 17 00:00:00 2001 From: alfontaine Date: Mon, 20 Jul 2020 10:50:52 -0600 Subject: [PATCH 04/10] al test --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index ee4b880..be82aaa 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,2 +1,2 @@ @Library('DCCSCR@master') _ -dccscrPipeline(version: "13.1.3") \ No newline at end of file +dccscrPipeline(version: "13.1.3-development") \ No newline at end of file -- GitLab From 93de6d68cdebcba8a578eae61f74afc11b647ae2 Mon Sep 17 00:00:00 2001 From: Al Fontaine Date: Mon, 20 Jul 2020 16:50:32 +0000 Subject: [PATCH 05/10] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index be82aaa..ee4b880 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,2 +1,2 @@ @Library('DCCSCR@master') _ -dccscrPipeline(version: "13.1.3-development") \ No newline at end of file +dccscrPipeline(version: "13.1.3") \ No newline at end of file -- GitLab From 723572dd5e182ab6dfcfc8ce9a34597e2e5effa1 Mon Sep 17 00:00:00 2001 From: alfontaine Date: Mon, 20 Jul 2020 10:53:50 -0600 Subject: [PATCH 06/10] gitlab update script --- Jenkinsfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ee4b880..e69de29 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,2 +0,0 @@ -@Library('DCCSCR@master') _ -dccscrPipeline(version: "13.1.3") \ No newline at end of file -- GitLab From 96775f7729fe5940e3a4fc507d93e074d041417e Mon Sep 17 00:00:00 2001 From: Al Fontaine Date: Mon, 20 Jul 2020 16:54:01 +0000 Subject: [PATCH 07/10] Update Jenkinsfile --- Jenkinsfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index e69de29..ee4b880 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -0,0 +1,2 @@ +@Library('DCCSCR@master') _ +dccscrPipeline(version: "13.1.3") \ No newline at end of file -- GitLab From 066e27461e406223ba7aad8dd45148db7051eed6 Mon Sep 17 00:00:00 2001 From: alfontaine Date: Mon, 20 Jul 2020 10:59:33 -0600 Subject: [PATCH 08/10] al test --- Jenkinsfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ee4b880..e69de29 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,2 +0,0 @@ -@Library('DCCSCR@master') _ -dccscrPipeline(version: "13.1.3") \ No newline at end of file -- GitLab From bb7c334497a8af444e39ea8bdc01d3346d46de56 Mon Sep 17 00:00:00 2001 From: Al Fontaine Date: Mon, 20 Jul 2020 17:00:03 +0000 Subject: [PATCH 09/10] Update Jenkinsfile --- Jenkinsfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index e69de29..08a04e7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -0,0 +1,2 @@ +@Library('DCCSCR@master') _ +dccscrPipeline(version: "13.1.3") -- GitLab From 58c0d393a7c2f7db3258d34ae2af04b72a777a46 Mon Sep 17 00:00:00 2001 From: alfontaine Date: Mon, 20 Jul 2020 13:00:57 -0600 Subject: [PATCH 10/10] gitlab update script --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 08a04e7..96a692b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,2 +1,2 @@ @Library('DCCSCR@master') _ -dccscrPipeline(version: "13.1.3") +dccscrPipeline(version: "13.1.3-development") -- GitLab