David Caro has uploaded a new change for review.
Change subject: Added job to deploy the yamls
......................................................................
Added job to deploy the yamls
Improved a bit also the defaults.
Change-Id: I40a1e90fdbf9766cfdf8827c6daf79df270cee47
Signed-off-by: David Caro <dcaro...@redhat.com>
---
R jobs/confs/shell-scripts/jenkins_check_yaml.sh
A jobs/confs/shell-scripts/jenkins_deploy_yamls.sh
M jobs/confs/yaml/defaults/defaults.yaml
R jobs/confs/yaml/jobs/jenkins_check_yaml.yaml
A jobs/confs/yaml/jobs/jenkins_deploy_yamls.yaml
5 files changed, 41 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/jenkins refs/changes/25/28825/1
diff --git a/jobs/confs/shell-scripts/check_yaml.sh
b/jobs/confs/shell-scripts/jenkins_check_yaml.sh
similarity index 100%
rename from jobs/confs/shell-scripts/check_yaml.sh
rename to jobs/confs/shell-scripts/jenkins_check_yaml.sh
diff --git a/jobs/confs/shell-scripts/jenkins_deploy_yamls.sh
b/jobs/confs/shell-scripts/jenkins_deploy_yamls.sh
new file mode 100644
index 0000000..adabe79
--- /dev/null
+++ b/jobs/confs/shell-scripts/jenkins_deploy_yamls.sh
@@ -0,0 +1,14 @@
+#!/bin/bash -ex
+## UPDATE JOBS FROM YAML
+confs_dir="${WORKSPACE}/jenkins/jobs/confs"
+yaml_dir="${confs_dir}/yaml"
+conf_file="${HOME}/.jenkinsjobsrc"
+### Flush the cache if specified
+if [[ "$FLUSH_CACHE" == "true" ]]; then
+ options="$options --flush-cache"
+fi
+jenkins-jobs \
+ --threads 0 \
+ --conf "$conf_file" \
+ $options \
+ update "$yaml_dir"
diff --git a/jobs/confs/yaml/defaults/defaults.yaml
b/jobs/confs/yaml/defaults/defaults.yaml
index ea1d0da..a264bd2 100644
--- a/jobs/confs/yaml/defaults/defaults.yaml
+++ b/jobs/confs/yaml/defaults/defaults.yaml
@@ -6,4 +6,6 @@
project-type: freestyle
concurrent: false
logrotate:
- numToKeep: 100
+ numToKeep: 40
+ wrappers:
+ - timestamps
diff --git a/jobs/confs/yaml/jobs/jenkins.yaml
b/jobs/confs/yaml/jobs/jenkins_check_yaml.yaml
similarity index 91%
rename from jobs/confs/yaml/jobs/jenkins.yaml
rename to jobs/confs/yaml/jobs/jenkins_check_yaml.yaml
index b8c8942..8343f07 100644
--- a/jobs/confs/yaml/jobs/jenkins.yaml
+++ b/jobs/confs/yaml/jobs/jenkins_check_yaml.yaml
@@ -20,7 +20,7 @@
scm:
- jenkins-master-gerrit
builders:
- - shell: !include-raw shell-scripts/check_yaml.sh
+ - shell: !include-raw shell-scripts/jenkins_check_yaml.sh
publishers:
- archive:
artifacts: '*.html'
diff --git a/jobs/confs/yaml/jobs/jenkins_deploy_yamls.yaml
b/jobs/confs/yaml/jobs/jenkins_deploy_yamls.yaml
new file mode 100644
index 0000000..7281f3c
--- /dev/null
+++ b/jobs/confs/yaml/jobs/jenkins_deploy_yamls.yaml
@@ -0,0 +1,23 @@
+- job:
+ name: jenkins_master_deploy-configs_merged
+ node: master
+ parameters:
+ - gerrit_params:
+ branch: master
+ triggers:
+ - gerrit:
+ trigger-on-change-merged-event: true
+ escape-quotes: true
+ successful-message: 'Configuration deployed'
+ projects:
+ - project-compare-type: 'PLAIN'
+ project-pattern: 'jenkins'
+ branch-compare-type: 'PLAIN'
+ branch-pattern: 'master'
+ file-paths:
+ - compare-type: 'REG_EXP'
+ pattern: 'jobs/confs/.*'
+ scm:
+ - jenkins-master-gerrit
+ builders:
+ - shell: !include-raw shell-scripts/jenkins_deploy_yamls.sh
--
To view, visit http://gerrit.ovirt.org/28825
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I40a1e90fdbf9766cfdf8827c6daf79df270cee47
Gerrit-PatchSet: 1
Gerrit-Project: jenkins
Gerrit-Branch: master
Gerrit-Owner: David Caro <dcaro...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
