From 8446f68a47ab00da66e433baf6ace0ef95f85172 Mon Sep 17 00:00:00 2001 From: xuchangx Date: Thu, 23 Oct 2014 09:54:31 +0800 Subject: [PATCH] Update jenkins-jobs configuration version Change-Id: I58a5c67e7bde1a12b39dbd9aae018ceb901a351f --- jobs/accept-or-reject-submission/config.xml | 12 ++++++------ jobs/buildlogs/config.xml | 14 ++++++++------ jobs/create-snapshot/config.xml | 21 ++++++++++----------- jobs/image-tester/config.xml | 24 ++++++++++++++---------- jobs/load-repo-conf/config.xml | 17 ++++++++++------- jobs/mail_sender/config.xml | 8 ++++---- jobs/monitor_scm_meta_git/config.xml | 13 ++++++++----- jobs/post-image-creation/config.xml | 11 ++++++----- jobs/pre-release-cleanup/config.xml | 11 ++++++----- jobs/pre-release-gerrit/config.xml | 25 +++++++++++++++++++------ jobs/release-snapshot/config.xml | 11 ++++++----- jobs/requests/config.xml | 2 +- jobs/snapdiff-sync/config.xml | 16 +++++++++------- jobs/submit-obs/config.xml | 19 ++++++++++++------- jobs/test-results-publisher/config.xml | 14 ++++++++------ 15 files changed, 127 insertions(+), 91 deletions(-) diff --git a/jobs/accept-or-reject-submission/config.xml b/jobs/accept-or-reject-submission/config.xml index ec0694f..b698c54 100644 --- a/jobs/accept-or-reject-submission/config.xml +++ b/jobs/accept-or-reject-submission/config.xml @@ -10,8 +10,7 @@ false - - + 100 @@ -56,7 +55,7 @@ false false false - + false @@ -65,11 +64,12 @@ - + false + - + configuration, jenkins-scripts/job_accept_or_reject.py, jenkins-scripts/common/* false @@ -77,7 +77,7 @@ false userContent - + ${WORKSPACE}/configuration false diff --git a/jobs/buildlogs/config.xml b/jobs/buildlogs/config.xml index 3892f1c..c01f6c4 100644 --- a/jobs/buildlogs/config.xml +++ b/jobs/buildlogs/config.xml @@ -10,7 +10,7 @@ false - + 100 @@ -21,7 +21,7 @@ false false false - + false @@ -42,7 +42,7 @@ if(matcher?.matches()) { } 0 - + false false true @@ -52,14 +52,16 @@ if(matcher?.matches()) { true false false + - + false + - + configuration, jenkins-scripts/job_buildlogs.py, jenkins-scripts/common/* false @@ -67,7 +69,7 @@ if(matcher?.matches()) { false userContent - + ${WORKSPACE}/configuration false diff --git a/jobs/create-snapshot/config.xml b/jobs/create-snapshot/config.xml index 2bbdf42..16cadd1 100644 --- a/jobs/create-snapshot/config.xml +++ b/jobs/create-snapshot/config.xml @@ -10,7 +10,7 @@ false - + 100 @@ -29,13 +29,13 @@ false false false - + false python ${WORKSPACE}/jenkins-scripts/job_create_snapshot.py - + @@ -53,7 +53,7 @@ - + @@ -70,7 +70,7 @@ - + @@ -101,19 +101,18 @@ if(matcher?.matches()) { - + false + 60 - - - + - + configuration, jenkins-scripts/job_create_snapshot.py, jenkins-scripts/common/* false @@ -121,7 +120,7 @@ if(matcher?.matches()) { false userContent - + ${WORKSPACE}/configuration false diff --git a/jobs/image-tester/config.xml b/jobs/image-tester/config.xml index c97a054..2eb3eca 100644 --- a/jobs/image-tester/config.xml +++ b/jobs/image-tester/config.xml @@ -10,7 +10,7 @@ false - + 100 @@ -22,13 +22,14 @@ - + false true true true + false @@ -38,7 +39,7 @@ false false false - + true @@ -47,7 +48,7 @@ python ${WORKSPACE}/jenkins-scripts/job_test_build.py - + Results.ENV @@ -63,7 +64,7 @@ python ${WORKSPACE}/jenkins-scripts/job_test_build.py def run = Thread.currentThread().executable def en = run.getEnvironment() manager.addShortText("Image " + en["IMAGE"] + " - " + en["TEST_RESULT"]) -if (en["TEST_RESULT"] != "PASS") +if (en["TEST_RESULT"] != "PASS") manager.buildFailure() 0 @@ -72,13 +73,15 @@ if (en["TEST_RESULT"] != "PASS") false - + RESULTS-PUBLISHING.env true + false + false test-results-publisher, @@ -89,11 +92,12 @@ if (en["TEST_RESULT"] != "PASS") - + false + - + configuration, jenkins-scripts/job_test_build.py, jenkins-scripts/common/* false @@ -101,11 +105,11 @@ if (en["TEST_RESULT"] != "PASS") false userContent - + ${WORKSPACE}/configuration false - + \ No newline at end of file diff --git a/jobs/load-repo-conf/config.xml b/jobs/load-repo-conf/config.xml index 2f89804..c196015 100644 --- a/jobs/load-repo-conf/config.xml +++ b/jobs/load-repo-conf/config.xml @@ -10,7 +10,7 @@ false - + 100 @@ -20,8 +20,8 @@ false false false - - + + @@ -51,9 +51,11 @@ + __ANY__ + false false @@ -70,11 +72,12 @@ python jenkins-scripts/job_load_repos.yaml.py - + false + - + configuration, jenkins-scripts/job_load_repos.yaml.py, jenkins-scripts/common/*, jenkins-scripts/testprojects/*, jenkins-scripts/gitbuildsys/* false @@ -82,11 +85,11 @@ python jenkins-scripts/job_load_repos.yaml.py false userContent - + ${WORKSPACE}/configuration false - + \ No newline at end of file diff --git a/jobs/mail_sender/config.xml b/jobs/mail_sender/config.xml index b3a4e7d..5fe8e54 100644 --- a/jobs/mail_sender/config.xml +++ b/jobs/mail_sender/config.xml @@ -10,7 +10,7 @@ false - + 100 @@ -19,7 +19,7 @@ false false false - + true @@ -31,7 +31,7 @@ python jenkins-scripts/job_mail_sender.py - + configuration, jenkins-scripts/job_mail_sender.py, jenkins-scripts/common/*, jenkins-scripts/testprojects/*, jenkins-scripts/gitbuildsys/* false @@ -39,7 +39,7 @@ python jenkins-scripts/job_mail_sender.py false userContent - + ${WORKSPACE}/configuration false diff --git a/jobs/monitor_scm_meta_git/config.xml b/jobs/monitor_scm_meta_git/config.xml index 4e17121..5b170fe 100644 --- a/jobs/monitor_scm_meta_git/config.xml +++ b/jobs/monitor_scm_meta_git/config.xml @@ -10,7 +10,7 @@ false - + 100 @@ -20,8 +20,8 @@ false false false - - + + @@ -51,10 +51,12 @@ + __ANY__ + false false @@ -72,11 +74,12 @@ python ${JENKINS_HOME}/jenkins-scripts/job_monitor_scm_meta_git.py - + false + - + ${JENKINS_HOME}/jobs/configuration false diff --git a/jobs/post-image-creation/config.xml b/jobs/post-image-creation/config.xml index fea92fb..2942141 100644 --- a/jobs/post-image-creation/config.xml +++ b/jobs/post-image-creation/config.xml @@ -10,7 +10,7 @@ false - + 100 @@ -29,7 +29,7 @@ false false false - + false @@ -51,7 +51,7 @@ if(matcher?.matches()) { 0 - + false false true @@ -61,10 +61,11 @@ if(matcher?.matches()) { true false false + - + configuration, jenkins-scripts/job_post_image.py, jenkins-scripts/common/*, jenkins-scripts/repomaker/*, jenkins-scripts/images/* false @@ -72,7 +73,7 @@ if(matcher?.matches()) { false userContent - + ${WORKSPACE}/configuration false diff --git a/jobs/pre-release-cleanup/config.xml b/jobs/pre-release-cleanup/config.xml index 332314d..b02aaca 100644 --- a/jobs/pre-release-cleanup/config.xml +++ b/jobs/pre-release-cleanup/config.xml @@ -10,7 +10,7 @@ false - + 100 @@ -30,7 +30,7 @@ false false false - + false @@ -52,11 +52,12 @@ if(matcher?.matches()) { - + false + - + configuration, jenkins-scripts/job_pre_release_obs.py, jenkins-scripts/common/*, jenkins-scripts/testprojects/*, jenkins-scripts/gitbuildsys/* false @@ -64,7 +65,7 @@ if(matcher?.matches()) { false userContent - + ${WORKSPACE}/configuration false diff --git a/jobs/pre-release-gerrit/config.xml b/jobs/pre-release-gerrit/config.xml index cae1d89..d77e4b7 100644 --- a/jobs/pre-release-gerrit/config.xml +++ b/jobs/pre-release-gerrit/config.xml @@ -10,7 +10,7 @@ false - + 100 @@ -30,6 +30,16 @@ Submit tag refs/tags/submit/tizen/ + + GERRIT_EVENT_ACCOUNT_NAME + + + + + GERRIT_EVENT_ACCOUNT_EMAIL + + + @@ -39,8 +49,8 @@ false false false - - + + @@ -70,9 +80,11 @@ + __ANY__ + false false @@ -102,15 +114,16 @@ if(matcher?.matches()) { - + false + - + ${JENKINS_HOME}/jobs/configuration false - + \ No newline at end of file diff --git a/jobs/release-snapshot/config.xml b/jobs/release-snapshot/config.xml index f9a0d2a..b0f0426 100644 --- a/jobs/release-snapshot/config.xml +++ b/jobs/release-snapshot/config.xml @@ -10,7 +10,7 @@ false - + 100 @@ -51,7 +51,7 @@ false false false - + false @@ -60,11 +60,12 @@ - + false + - + configuration, jenkins-scripts/job_release_snapshot.py, jenkins-scripts/common/* false @@ -72,7 +73,7 @@ false userContent - + ${WORKSPACE}/configuration false diff --git a/jobs/requests/config.xml b/jobs/requests/config.xml index 67b3fa0..8660150 100644 --- a/jobs/requests/config.xml +++ b/jobs/requests/config.xml @@ -80,4 +80,4 @@ manager.addShortText(prj.group(1)+':'+pkg.group(1)+':'+state - + \ No newline at end of file diff --git a/jobs/snapdiff-sync/config.xml b/jobs/snapdiff-sync/config.xml index 07ea4ec..04b9e6d 100644 --- a/jobs/snapdiff-sync/config.xml +++ b/jobs/snapdiff-sync/config.xml @@ -10,7 +10,7 @@ false - + 100 @@ -40,7 +40,7 @@ python ${WORKSPACE}/jenkins-scripts/job_sync_snapdiff.py - + false false true @@ -50,26 +50,28 @@ python ${WORKSPACE}/jenkins-scripts/job_sync_snapdiff.py true false false + - + false + - - configuration, jenkins-scripts/job_sync_snapdiff.py, jenkins-scripts/common/*, jenkins-scripts/templates/* + + configuration, jenkins-scripts/job_sync_snapdiff.py, jenkins-scripts/common/*, jenkins-scripts/templates/* false false false userContent - + ${WORKSPACE}/configuration false - + \ No newline at end of file diff --git a/jobs/submit-obs/config.xml b/jobs/submit-obs/config.xml index 393d581..50d54c7 100644 --- a/jobs/submit-obs/config.xml +++ b/jobs/submit-obs/config.xml @@ -10,7 +10,7 @@ false - + 100 @@ -20,8 +20,8 @@ false false false - - + + @@ -51,9 +51,11 @@ + __ANY__ + false false @@ -76,13 +78,15 @@ if(matcher?.matches()) { } 0 - + ${BUILD_TAG}.env false + false + false mail_sender, @@ -93,11 +97,12 @@ if(matcher?.matches()) { - + false + - + configuration, jenkins-scripts/job_submitobs.py, jenkins-scripts/common/* false @@ -105,7 +110,7 @@ if(matcher?.matches()) { false userContent - + ${WORKSPACE}/configuration false diff --git a/jobs/test-results-publisher/config.xml b/jobs/test-results-publisher/config.xml index ad36971..6196600 100644 --- a/jobs/test-results-publisher/config.xml +++ b/jobs/test-results-publisher/config.xml @@ -10,7 +10,7 @@ false - + 100 @@ -22,13 +22,14 @@ - + false true true true + false @@ -37,7 +38,7 @@ false false false - + true @@ -49,11 +50,12 @@ python ${WORKSPACE}/jenkins-scripts/job_publish_test_results.py - + false + - + configuration, jenkins-scripts/job_publish_test_results.py, jenkins-scripts/common/* false @@ -61,7 +63,7 @@ python ${WORKSPACE}/jenkins-scripts/job_publish_test_results.py false userContent - + ${WORKSPACE}/configuration false -- 2.7.4