Skip to content

Commit

Permalink
updated agent from 3.19 to 3.21
Browse files Browse the repository at this point in the history
  • Loading branch information
CSpicer-BAH committed Jun 16, 2020
1 parent cbbcd4f commit 8744f8c
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions jenkins-agent/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion jenkins-agent/prebuild/build-dep.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

This file was deleted.

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9b8f9d814850ee50738dcee67c2e8d0ffd42143034ff4ed169cbb1071db32bad
Binary file not shown.
4 changes: 2 additions & 2 deletions jenkins-agent/prebuild/pull-from-centos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions jenkins-agent/prebuild/pull-from-ubi.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 8744f8c

Please sign in to comment.