Merge "Debmirror: fix dogtag dep's"
diff --git a/docker/swarm/stack/jenkins/slave.yml b/docker/swarm/stack/jenkins/slave.yml
index e6ed298..f3cd90c 100644
--- a/docker/swarm/stack/jenkins/slave.yml
+++ b/docker/swarm/stack/jenkins/slave.yml
@@ -35,7 +35,6 @@
image: ${_param:docker_image_jenkins_slave}
volumes:
- /etc/ssl/certs/java/cacerts:/etc/ssl/certs/java/cacerts:ro
- - /etc/aptly:/etc/aptly:ro
- /var/run/docker.sock:/var/run/docker.sock
- /usr/bin/docker:/usr/bin/docker:ro
- /var/lib/jenkins:/var/lib/jenkins
@@ -59,7 +58,6 @@
image: ${_param:docker_image_jenkins_slave}
volumes:
- /etc/ssl/certs/java/cacerts:/etc/ssl/certs/java/cacerts:ro
- - /etc/aptly:/etc/aptly:ro
- /var/run/docker.sock:/var/run/docker.sock
- /usr/bin/docker:/usr/bin/docker:ro
- /var/lib/jenkins:/var/lib/jenkins
@@ -83,7 +81,6 @@
image: ${_param:docker_image_jenkins_slave}
volumes:
- /etc/ssl/certs/java/cacerts:/etc/ssl/certs/java/cacerts:ro
- - /etc/aptly:/etc/aptly:ro
- /var/run/docker.sock:/var/run/docker.sock
- /usr/bin/docker:/usr/bin/docker:ro
- /var/lib/jenkins:/var/lib/jenkins
diff --git a/jenkins/client/job/test_pipelines.yml b/jenkins/client/job/test_pipelines.yml
index 2b0fabe..d18b281 100644
--- a/jenkins/client/job/test_pipelines.yml
+++ b/jenkins/client/job/test_pipelines.yml
@@ -11,6 +11,8 @@
repo: mcp-ci/pipeline-library
- name: oss-jenkins-pipelines
repo: oss/jenkins/pipelines
+ - name: map-map-pipelines
+ repo: map/map-pipelines
template:
discard:
build:
diff --git a/jenkins/client/job/validate.yml b/jenkins/client/job/validate.yml
index 4d18225..207296b 100644
--- a/jenkins/client/job/validate.yml
+++ b/jenkins/client/job/validate.yml
@@ -148,6 +148,26 @@
type: boolean
default: 'true'
description: If chosen then previous build results will be used in the current build
+ RALLY_PLUGINS_REPO:
+ type: string
+ default: ""
+ description: Git repository with Rally plugins
+ RALLY_PLUGINS_BRANCH:
+ type: string
+ default: ""
+ description: Git branch which will be used during the checkout
+ K8S_RALLY:
+ type: boolean
+ default: 'false'
+ description: If chosen then K8S Rally test will be executed
+ JOB_TIMEOUT:
+ type: string
+ default: "3"
+ description: Job timeout in hours
+ REPORT_DIR:
+ type: string
+ default: ""
+ description: Path for reports outside docker image
cvp-sanity:
type: workflow-scm
name: cvp-sanity