Skip to content

Commit

Permalink
Update slave versions and fix to CoP land repos (#274)
Browse files Browse the repository at this point in the history 
* Update slave versions and fix to CoP land repos

* Fix slave path... oops

* FIX - broken slaves not launching in Jenkins
  • Loading branch information
@springdo @pcarney8
springdo authored and pcarney8 committed May 14, 2019
1 parent 1608eb5 commit 6c796bb
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 13 deletions.
4 changes: 2 additions & 2 deletions params/jenkins-slaves/ansible
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ SOURCE_REPOSITORY_URL=https://github.com/redhat-cop/containers-quickstarts.git
SOURCE_CONTEXT_DIR=jenkins-slaves/jenkins-slave-ansible
BUILDER_IMAGE_NAME=registry.access.redhat.com/openshift3/jenkins-slave-base-rhel7:v3.11
NAME=jenkins-slave-ansible
SOURCE_REPOSITORY_REF=v1.3
DOCKERFILE_PATH=Dockerfile
SOURCE_REPOSITORY_REF=v1.9
SLAVE_IMAGE_TAG=latest
3 changes: 2 additions & 1 deletion params/jenkins-slaves/arachni
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ SOURCE_REPOSITORY_URL=https://github.com/redhat-cop/containers-quickstarts.git
SOURCE_CONTEXT_DIR=jenkins-slaves/jenkins-slave-arachni
BUILDER_IMAGE_NAME=registry.access.redhat.com/openshift3/jenkins-slave-base-rhel7:v3.11
NAME=jenkins-slave-arachni
SOURCE_REPOSITORY_REF=v1.3
SOURCE_REPOSITORY_REF=v1.9
SLAVE_IMAGE_TAG=latest
3 changes: 2 additions & 1 deletion params/jenkins-slaves/golang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ SOURCE_REPOSITORY_URL=https://github.com/redhat-cop/containers-quickstarts.git
SOURCE_CONTEXT_DIR=jenkins-slaves/jenkins-slave-golang
BUILDER_IMAGE_NAME=registry.access.redhat.com/openshift3/jenkins-slave-base-rhel7:v3.11
NAME=jenkins-slave-golang
SOURCE_REPOSITORY_REF=v1.3
SOURCE_REPOSITORY_REF=v1.9
SLAVE_IMAGE_TAG=latest
3 changes: 2 additions & 1 deletion params/jenkins-slaves/gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ SOURCE_REPOSITORY_URL=https://github.com/redhat-cop/containers-quickstarts.git
SOURCE_CONTEXT_DIR=jenkins-slaves/jenkins-slave-gradle
BUILDER_IMAGE_NAME=registry.access.redhat.com/openshift3/jenkins-slave-base-rhel7:v3.11
NAME=jenkins-slave-gradle
SOURCE_REPOSITORY_REF=v1.3
SOURCE_REPOSITORY_REF=v1.9
SLAVE_IMAGE_TAG=latest
3 changes: 2 additions & 1 deletion params/jenkins-slaves/mongodb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ SOURCE_REPOSITORY_URL=https://github.com/redhat-cop/containers-quickstarts.git
SOURCE_CONTEXT_DIR=jenkins-slaves/jenkins-slave-mongodb
BUILDER_IMAGE_NAME=registry.access.redhat.com/openshift3/jenkins-slave-base-rhel7:v3.11
NAME=jenkins-slave-mongodb
SOURCE_REPOSITORY_REF=v1.3
SOURCE_REPOSITORY_REF=v1.9
SLAVE_IMAGE_TAG=latest
5 changes: 3 additions & 2 deletions params/jenkins-slaves/mvn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@ SOURCE_REPOSITORY_URL=https://github.com/redhat-cop/containers-quickstarts.git
SOURCE_CONTEXT_DIR=jenkins-slaves/jenkins-slave-mvn
BUILDER_IMAGE_NAME=registry.access.redhat.com/openshift3/jenkins-agent-maven-35-rhel7:latest
NAME=jenkins-slave-mvn
SOURCE_REPOSITORY_REF=v1.8
DOCKERFILE_PATH=Dockerfile
SOURCE_REPOSITORY_REF=v1.9
DOCKERFILE_PATH=Dockerfile
SLAVE_IMAGE_TAG=latest
3 changes: 2 additions & 1 deletion params/jenkins-slaves/npm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ SOURCE_CONTEXT_DIR=jenkins-slaves/jenkins-slave-npm
BUILDER_IMAGE_NAME=registry.access.redhat.com/openshift3/jenkins-slave-base-rhel7:v3.11
NAME=jenkins-slave-npm
SOURCE_REPOSITORY_REF=v1.9
DOCKERFILE_PATH=Dockerfile.rhel7
DOCKERFILE_PATH=Dockerfile.rhel7
SLAVE_IMAGE_TAG=latest
3 changes: 2 additions & 1 deletion params/jenkins-slaves/python
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ SOURCE_REPOSITORY_URL=https://github.com/redhat-cop/containers-quickstarts.git
SOURCE_CONTEXT_DIR=jenkins-slaves/jenkins-slave-python
BUILDER_IMAGE_NAME=registry.access.redhat.com/openshift3/jenkins-slave-base-rhel7:v3.11
NAME=jenkins-slave-python
SOURCE_REPOSITORY_REF=v1.3
SOURCE_REPOSITORY_REF=v1.9
SLAVE_IMAGE_TAG=latest
8 changes: 5 additions & 3 deletions params/jenkins-slaves/zap
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
SOURCE_REPOSITORY_URL=https://github.com/rht-labs/owasp-zap-openshift.git
SOURCE_REPOSITORY_URL=https://github.com/redhat-cop/containers-quickstarts.git
SOURCE_CONTEXT_DIR=jenkins-slaves/jenkins-slave-zap
BUILDER_IMAGE_NAME=centos:centos7
NAME=jenkins-slave-zap
SOURCE_REPOSITORY_REF=master
DOCKERFILE_PATH=Dockerfile
SOURCE_REPOSITORY_REF=v1.9
DOCKERFILE_PATH=Dockerfile
SLAVE_IMAGE_TAG=latest

0 comments on commit 6c796bb

Please sign in to comment.