Merge changes Ic6c850a6,I2f817418
* changes:
Added openldap build, add new DOCKER_GIT_TAG param
Added extensible choice plugin, disable system reclass autotesting
diff --git a/jenkins/client/init.yml b/jenkins/client/init.yml
index 191527f..ab057df 100644
--- a/jenkins/client/init.yml
+++ b/jenkins/client/init.yml
@@ -25,6 +25,7 @@
discard-old-build: {}
docker-workflow: {}
extended-choice-parameter: {}
+ extensible-choice-parameter: {}
gerrit-trigger: {}
git: {}
heavy-job: {}
diff --git a/jenkins/client/job/docker/aptly.yml b/jenkins/client/job/docker/aptly.yml
index 4e77d2a..98ef8af 100644
--- a/jenkins/client/job/docker/aptly.yml
+++ b/jenkins/client/job/docker/aptly.yml
@@ -43,3 +43,6 @@
REGISTRY_CREDENTIALS_ID:
type: string
default: "dockerhub"
+ DOCKER_GIT_TAG:
+ type: boolean
+ default: "true"
diff --git a/jenkins/client/job/docker/init.yml b/jenkins/client/job/docker/init.yml
index f4a6a87..7bb0dac 100644
--- a/jenkins/client/job/docker/init.yml
+++ b/jenkins/client/job/docker/init.yml
@@ -23,7 +23,11 @@
dockerfile: "Dockerfile"
- name: phpldapadmin
branch: "master"
- tags: "0.16.2 latest"
+ tags: "latest"
+ dockerfile: "image/Dockerfile"
+ - name: openldap
+ branch: "master"
+ tags: "latest"
dockerfile: "image/Dockerfile"
template:
discard:
@@ -71,4 +75,7 @@
default: ""
REGISTRY_CREDENTIALS_ID:
type: string
- default: "dockerhub"
\ No newline at end of file
+ default: "dockerhub"
+ DOCKER_GIT_TAG:
+ type: boolean
+ default: "true"
\ No newline at end of file
diff --git a/jenkins/client/job/salt-models/tests.yml b/jenkins/client/job/salt-models/tests.yml
index c980d1d..1545eff 100644
--- a/jenkins/client/job/salt-models/tests.yml
+++ b/jenkins/client/job/salt-models/tests.yml
@@ -70,11 +70,6 @@
branches:
- master
event:
- patchset:
- - created:
- excludeDrafts: false
- excludeTrivialRebase: false
- excludeNoCodeChange: false
comment:
- addedContains:
commentAddedCommentContains: '(recheck|reverify)'