From 8744f8cb324b1907cd594a25fa6471c086bb44a7 Mon Sep 17 00:00:00 2001
From: CSpicer-BAH <spicer_casey@bah.com>
Date: Tue, 16 Jun 2020 14:48:00 -0400
Subject: [PATCH] updated agent from 3.19 to 3.21

---
 jenkins-agent/Dockerfile                          |   4 ++--
 jenkins-agent/prebuild/build-dep.sh               |   2 +-
 .../jenkins-agent-dependencies-dcar-1.1.sha256    |   1 -
 .../jenkins-agent-dependencies-dcar-1.1.sig       | Bin 566 -> 0 bytes
 .../jenkins-agent-dependencies-dcar-1.2.sha256    |   1 +
 .../jenkins-agent-dependencies-dcar-1.2.sig       | Bin 0 -> 566 bytes
 jenkins-agent/prebuild/pull-from-centos.sh        |   4 ++--
 jenkins-agent/prebuild/pull-from-ubi.sh           |   4 ++--
 8 files changed, 8 insertions(+), 8 deletions(-)
 delete mode 100644 jenkins-agent/prebuild/jenkins-agent-dependencies-dcar-1.1.sha256
 delete mode 100644 jenkins-agent/prebuild/jenkins-agent-dependencies-dcar-1.1.sig
 create mode 100644 jenkins-agent/prebuild/jenkins-agent-dependencies-dcar-1.2.sha256
 create mode 100644 jenkins-agent/prebuild/jenkins-agent-dependencies-dcar-1.2.sig

diff --git a/jenkins-agent/Dockerfile b/jenkins-agent/Dockerfile
index 8cc1abb..8c0c0e1 100644
--- a/jenkins-agent/Dockerfile
+++ b/jenkins-agent/Dockerfile
@@ -6,7 +6,7 @@ FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 # this container must run as privileged
 USER root
 
-ENV JENKINS_AGENT_VERSION dcar-1.1
+ENV JENKINS_AGENT_VERSION dcar-1.2
 
 ### Required Atomic/OpenShift Labels - https://github.com/projectatomic/ContainerApplicationGenericLabels
 LABEL name="Solutions Delivery Platform: Jenkins Agent" \
@@ -27,7 +27,7 @@ RUN INSTALL_PKGS="tar hostname device-mapper-persistent-data lvm2 java-1.8.0-ope
     yum --disableplugin=subscription-manager -y install --setopt=tsflags=nodocs ${INSTALL_PKGS}
 
 ### Install your application here -- add all other necessary items to build your image
-ENV JENKINS_SWARM_VERSION 3.19
+ENV JENKINS_SWARM_VERSION 3.21
 ENV JNLP_SLAVE_VERSION 4.3
 ENV HOME /root
 ENV JAVA_HOME /usr/lib/jvm/java
diff --git a/jenkins-agent/prebuild/build-dep.sh b/jenkins-agent/prebuild/build-dep.sh
index 580e26b..61767a6 100755
--- a/jenkins-agent/prebuild/build-dep.sh
+++ b/jenkins-agent/prebuild/build-dep.sh
@@ -2,7 +2,7 @@
 
 set -xe
 
-JENKINS_AGENT_VERSION=dcar-1.1
+JENKINS_AGENT_VERSION=dcar-1.2
 
 cd /root/prebuild
 tar czvf jenkins-agent-dependencies-$JENKINS_AGENT_VERSION.tar.gz dependencies
diff --git a/jenkins-agent/prebuild/jenkins-agent-dependencies-dcar-1.1.sha256 b/jenkins-agent/prebuild/jenkins-agent-dependencies-dcar-1.1.sha256
deleted file mode 100644
index 49567e6..0000000
--- a/jenkins-agent/prebuild/jenkins-agent-dependencies-dcar-1.1.sha256
+++ /dev/null
@@ -1 +0,0 @@
-ba2848294bc792f8f6735c5c0750ce148b05f09b92c9bf80f08ccefe85ffd9d0
diff --git a/jenkins-agent/prebuild/jenkins-agent-dependencies-dcar-1.1.sig b/jenkins-agent/prebuild/jenkins-agent-dependencies-dcar-1.1.sig
deleted file mode 100644
index 1c4aaa60ee5d6bb4d3fd4c46cb4d2f9f20fe050e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 566
zcmV-60?GY}0y6{v0SEvc79j+Q(BL-k%6xr1=jq0gqf3XFAz9o70$#eox&R6Z5Rs!x
zhnOK*+^4h;|6O=6+Y|~`*9V_~1W<v@(uOjx9ndBu_Nz^S8*ehFf3x)Nw&F4~wER<j
z{CH}_Tf{h6Ob(@qV?G6fD+C2l86zzwzl&s{E#<+fz-|btMNyKAq~J!efCGg=F{PED
z4m;<2T}_rRPvg9E@<B~NB%<28p{uhX$A@P|eVkqGlwMPo!l>yar@Q6aCB82lkY!hw
zIDydH3yWbc0<+}u)_6R&9!N2kTBk>&kzEFyxH&M!n=Xem<1mqHw@Bq9`3}ZRixdvV
z5AnnpTMwpYCp@%;(W8G~j%k~DotKONw&71ZjM@)J17AgRgNGt&!eYdG7Bf<a6<J&|
zNi|@r5U4(hAa^Ht#Rg7_0=T3nto-$4iz^Ar-?yd)ixu0{q^w!z$Ow4=M<_p+kb#Il
znt*-W{1tZTms{xu5U@v$hDEbYzXwgY`ga+%6_m?+FRuNHy={?{jEqnwehoyJbJsUC
zxb&P=(UFZYdM7fN39>`5*Wz4p|Cv}=1#-`_HCT{P<l%F~I}m4gmgXfwKQB^&HkHZ2
zh%Iwy=h<ra<AEX_Xkua&ey6To{)ezfY0(2jC6nF77AAme^1Ac7k%~c+g^uHH32?J4
z69mZ9tr621U-?Hv%SjOm&LWw+FDLVsFl2M;`l%4~bOnzMRySMaJe<<qr0Q3#2$`j^
ELh~UAF8}}l

diff --git a/jenkins-agent/prebuild/jenkins-agent-dependencies-dcar-1.2.sha256 b/jenkins-agent/prebuild/jenkins-agent-dependencies-dcar-1.2.sha256
new file mode 100644
index 0000000..d5508b0
--- /dev/null
+++ b/jenkins-agent/prebuild/jenkins-agent-dependencies-dcar-1.2.sha256
@@ -0,0 +1 @@
+9b8f9d814850ee50738dcee67c2e8d0ffd42143034ff4ed169cbb1071db32bad
diff --git a/jenkins-agent/prebuild/jenkins-agent-dependencies-dcar-1.2.sig b/jenkins-agent/prebuild/jenkins-agent-dependencies-dcar-1.2.sig
new file mode 100644
index 0000000000000000000000000000000000000000..e1f1c94c94ba8f62f9a7b80ba185272cbce01084
GIT binary patch
literal 566
zcmV-60?GY}0y6{v0SEvc79j+Q(BL-k%6xr1=jq0gqf3XFAz9o70$%9`rvM5G5Rs!x
zhnOK*+*~3L`U6*tqIhv+N|mt}XL$`nO-<CDC4HjGit+2gkUvLfE(wvBLqET;-;UcE
z+HIsfsWSI98Zt)|)a!Nt`YR?O-he=lQGDfzA8G$z1>=Efqi?B#3ahO@Lj9y$Wr}YD
zfP(TpmH6y0R13*9GczKP*=%_iYzq1&3j%Rg-AVS3?q(XrO<S>i{6XTGVX2R<vEU9*
zpt5z}y4p66xcog;I547n=@Cz3vAfQ;5>lgw7F`^;No3jlMq9K9?x(l%!Z!b&mxSU-
zqp2|8Oxs?ueyuz8cqq~tCf%l%>Qvkl6&x3fj0?D$e))k<5A|yt`>~NtSDwhZwc3Po
zP6kM<R^!yU@X5MaL;-Fv+e1zoL;Ahn6Mw+W$NsQL*k9;CFna;yOYEpgNE^rAr`i0K
zI8({|sG(g>Y#FhKRpTs;^m=b%lsny<cm}tvCe@Pq_-D1VuLhBRj|9B-*<wxWex(z>
z+_>$!qFaVV;sQYVq8t7~>DD(_zVEqol@_#l<PSb;s@CO1;Wyq^`Vr7a_POc#@OcXm
z&Evk6o7R?MS!w?~Zd^afuFFL<)0@i+rP*T|l`Pl7J~)lFbyH$*v5P!)^!<n+^cvtB
zcsN=<3PxB>ec!zQ`qIrmB(LF;JPGjj?hEad>DbCl8pGeQn#d~qC+`*3rATo&y4*6_
EDTFQ{LjV8(

literal 0
HcmV?d00001

diff --git a/jenkins-agent/prebuild/pull-from-centos.sh b/jenkins-agent/prebuild/pull-from-centos.sh
index 4611f96..2a9f685 100755
--- a/jenkins-agent/prebuild/pull-from-centos.sh
+++ b/jenkins-agent/prebuild/pull-from-centos.sh
@@ -2,8 +2,8 @@
 
 set -xe
 
-JENKINS_AGENT_VERSION=dcar-1.1
-JENKINS_SWARM_VERSION=3.19
+JENKINS_AGENT_VERSION=dcar-1.2
+JENKINS_SWARM_VERSION=3.21
 JNLP_SLAVE_VERSION=4.3
 
 rm -rf /root/prebuild/dependencies
diff --git a/jenkins-agent/prebuild/pull-from-ubi.sh b/jenkins-agent/prebuild/pull-from-ubi.sh
index 889232a..be02ff0 100755
--- a/jenkins-agent/prebuild/pull-from-ubi.sh
+++ b/jenkins-agent/prebuild/pull-from-ubi.sh
@@ -2,8 +2,8 @@
 
 set -xe
 
-JENKINS_AGENT_VERSION=dcar-1.1
-JENKINS_SWARM_VERSION=3.19
+JENKINS_AGENT_VERSION=dcar-1.2
+JENKINS_SWARM_VERSION=3.21
 JNLP_SLAVE_VERSION=4.3
 
 curl --create-dirs -sSLo /root/prebuild/dependencies/swarm-client/swarm-client-${JENKINS_SWARM_VERSION}.jar http://repo.jenkins-ci.org/releases/org/jenkins-ci/plugins/swarm-client/${JENKINS_SWARM_VERSION}/swarm-client-${JENKINS_SWARM_VERSION}.jar