From c25ac13bff1769e325851a4f341dbcd3e8bf82bf Mon Sep 17 00:00:00 2001 From: hyokeun Date: Tue, 4 Jul 2017 11:31:34 +0900 Subject: [PATCH] New jobs: submit group, aws slave control 1. pre-release-gerrit-group: Wait 120 seconds and process all the pending SRs altogether. 2. ondemand_slave_control: Create image slaves if we have not enough slaves. Change-Id: I78011ccca37fe666ab5359177b0d35cf6a6d3c10 --- debian/jenkins-jobs.install | 2 + jobs/create-snapshot/config.xml | 42 +++---- jobs/ondemand_slave_control/config.xml | 113 +++++++++++++++++++ jobs/pre-release-create/config.xml | 19 ++++ jobs/pre-release-gerrit-group/config.xml | 182 +++++++++++++++++++++++++++++++ jobs/pre-release-gerrit/config.xml | 45 ++++++-- packaging/jenkins-jobs.spec | 4 + 7 files changed, 377 insertions(+), 30 deletions(-) create mode 100644 jobs/ondemand_slave_control/config.xml create mode 100644 jobs/pre-release-gerrit-group/config.xml diff --git a/debian/jenkins-jobs.install b/debian/jenkins-jobs.install index b7db08b..9f83707 100644 --- a/debian/jenkins-jobs.install +++ b/debian/jenkins-jobs.install @@ -48,4 +48,6 @@ find-incorrect-filenames /var/lib/jenkins/jobs/ rsync_download /var/lib/jenkins/jobs/ sync_repo /var/lib/jenkins/jobs/ update-public-git /var/lib/jenkins/jobs/ +pre-release-gerrit-group /var/lib/jenkins/jobs/ +ondemand_slave_control /var/lib/jenkins/jobs/ diff --git a/jobs/create-snapshot/config.xml b/jobs/create-snapshot/config.xml index d54300a..48065a7 100755 --- a/jobs/create-snapshot/config.xml +++ b/jobs/create-snapshot/config.xml @@ -50,6 +50,25 @@ + SLAVE_BUILDER.env + SKIP + + + ondemand_slave_control + ALWAYS + false + false + + false + + + + + + + + + REF_CREATE_PRJ_OBS.env SKIP @@ -112,26 +131,7 @@ ALWAYS false false - - - FAILURE - 2 - RED - true - - - FAILURE - 2 - RED - true - - - FAILURE - 2 - RED - true - - + false @@ -246,4 +246,4 @@ if(matcher?.matches()) { - + \ No newline at end of file diff --git a/jobs/ondemand_slave_control/config.xml b/jobs/ondemand_slave_control/config.xml new file mode 100644 index 0000000..d6690d3 --- /dev/null +++ b/jobs/ondemand_slave_control/config.xml @@ -0,0 +1,113 @@ + + + + + false + + + false + GLOBAL + DISABLED + + + + false + false + + + + + ACTION + + + + REVOKE_WORKER + REQUEST_WORKER + + + + + PURPOSE + + + + JENKINS_IMAGER + OBS_WORKER_NORMAL + OBS_WORKER_POWER + + + + + REQUESTED_NUM_EXECUTORS + + 0 + + + + + + 0 + 1.submit + false + false + false + false + + + H/15 * * * * + + + false + + + + /var/lib/jenkins/jenkins-scripts/job_control_ondemand_slaves.groovy + + + + + + + false + + 0 + false + + + hyokeun.jeon@samsung.com + false + false + + + + + false + + + + + configuration + + false + false + false + userContent + + + + ${WORKSPACE}/configuration + + + false + + false + + + + \ No newline at end of file diff --git a/jobs/pre-release-create/config.xml b/jobs/pre-release-create/config.xml index 6a65a97..5606e91 100755 --- a/jobs/pre-release-create/config.xml +++ b/jobs/pre-release-create/config.xml @@ -55,6 +55,25 @@ python ${WORKSPACE}/jenkins-scripts/job_pre_release_obs.py create_images + SLAVE_BUILDER.env + SKIP + + + ondemand_slave_control + ALWAYS + false + false + + false + + + + + + + + + image_trigger_*.env SKIP diff --git a/jobs/pre-release-gerrit-group/config.xml b/jobs/pre-release-gerrit-group/config.xml new file mode 100644 index 0000000..8ff92fd --- /dev/null +++ b/jobs/pre-release-gerrit-group/config.xml @@ -0,0 +1,182 @@ + + + + + false + + + false + UNDEFINED + DISABLED + + + + + 7 + 2000 + -1 + -1 + + + + false + false + + + + + GERRIT_EVENT_TYPE + + + + + GERRIT_EVENT_HASH + + + + + GERRIT_PROJECT + Gerrit Project + platform/ + + + GERRIT_REFNAME + Sumbit tag + refs/tags/submit/tizen/ + + + GERRIT_NEWREV + Submit tag + refs/tags/submit/tizen/ + + + GERRIT_OLDREV + + + + + GERRIT_EVENT_ACCOUNT_NAME + + + + + GERRIT_EVENT_ACCOUNT_EMAIL + + + + + GERRIT_EVENT_ACCOUNT + + + + + + + + 120 + submit + false + false + false + false + + false + + + #!/bin/bash +export +set |grep GERRIT_ +python ${WORKSPACE}/jenkins-scripts/job_submit.py prerelease + + + + + + + + BUILD-MONITOR_*.env + SKIP + + + BUILD-MONITOR + ALWAYS + false + false + false + + + + + + + + false + + 0 + false + + + + + + + ${BUILD_TAG}.env + true + false + false + + + mail_sender + SUCCESS + false + false + + + + + BUILD-MONITOR.env + true + false + false + + + BUILD-MONITOR + ALWAYS + false + false + + + + + + + false + + + + + configuration, jenkins-scripts/common/*, jenkins-scripts/job_submit.py + + false + false + false + userContent + + + + ${JENKINS_HOME}/jobs/configuration + + + false + + false + + + + diff --git a/jobs/pre-release-gerrit/config.xml b/jobs/pre-release-gerrit/config.xml index 1b128cb..c052408 100755 --- a/jobs/pre-release-gerrit/config.xml +++ b/jobs/pre-release-gerrit/config.xml @@ -53,11 +53,13 @@ + 30 submit false false false false + GERRIT_TRIGGER @@ -111,19 +113,36 @@ #!/bin/bash export set |grep GERRIT_ -python ${JENKINS_HOME}/jenkins-scripts/job_submit.py prerelease +python ${WORKSPACE}/jenkins-scripts/job_submit.py prerelease bypass + + + + + + + + PRE-RELEASE-SUBMIT-GROUP_*.env + SKIP + + + pre-release-gerrit-group + ALWAYS + false + false + false + + + false @@ -137,7 +156,7 @@ if(matcher?.matches()) { ${BUILD_TAG}.env - false + true false false @@ -151,7 +170,7 @@ if(matcher?.matches()) { BUILD-MONITOR.env - false + true false false @@ -175,6 +194,14 @@ if(matcher?.matches()) { + + configuration, jenkins-scripts/common/*, jenkins-scripts/job_submit.py + + false + false + false + userContent + ${JENKINS_HOME}/jobs/configuration diff --git a/packaging/jenkins-jobs.spec b/packaging/jenkins-jobs.spec index 6de029d..c4f4ee8 100644 --- a/packaging/jenkins-jobs.spec +++ b/packaging/jenkins-jobs.spec @@ -190,6 +190,10 @@ fi %config %{destdir}/sync_repo/config.xml %dir %{destdir}/update-public-git/ %config %{destdir}/update-public-git/config.xml +%dir %{destdir}/pre-release-gerrit-group/ +%config %{destdir}/pre-release-gerrit-group/config.xml +%dir %{destdir}/ondemand_slave_control/ +%config %{destdir}/ondemand_slave_control/config.xml %files common %defattr(-,jenkins,jenkins) -- 2.7.4