Merge lp:~didrocks/cupstream2distro-config/skip-version-check into lp:cupstream2distro-config

[Didier Roche-Tolomelli]

add skip dest check runtime parameter for forcing uploading even the Vcs doesn't have the destination changelog version.

add skip dest check runtime parameter for forcing uploading even the Vcs doesn't have the destination changelog version.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:528
http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-ci/378/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-saucy-amd64-ci/176

Click here to trigger a rebuild:
http://s-jenkins:8080/job/cupstream2distro-config-ci/378/rebuild

review: Approve (continuous-integration)

[Łukasz Zemczak (sil2100)]

A risky addition... but if there is rationale from distro to have that in, then it's ok I guess.

review: Approve

=== modified file 'daily-release/jenkins-templates/master-config.xml.tmpl'
--- daily-release/jenkins-templates/master-config.xml.tmpl	2013-07-17 11:17:27 +0000
+++ daily-release/jenkins-templates/master-config.xml.tmpl	2013-07-17 11:17:27 +0000
@@ -23,8 +23,13 @@
           <defaultValue>false</defaultValue>
         </hudson.model.BooleanParameterDefinition>
         <hudson.model.BooleanParameterDefinition>
+          <name>SKIP_DEST_CHECK</name>
+          <description>Skip destination version check. This will then triggers FORCE_REBUILD as well and force an upload even if the latest changes in dest is not in the Vcs (note that debian/changelog will probably relist commits that are already in dest).</description>
+          <defaultValue>false</defaultValue>
+        </hudson.model.BooleanParameterDefinition>
+        <hudson.model.BooleanParameterDefinition>
           <name>FORCE_REBUILD</name>
-          <description>Force rebuilding above selected components (matching eventually REBUILD_ONLY), even if they have nothing to release.</description>
+          <description>Force rebuilding above selected components (matching eventually REBUILD_ONLY), even if they have nothing to release. Note that if destination has a version that is not in the Vcs and that SKIP_DEST_CHECK is not enabled, this will still warn and block the rebuild.</description>
           <defaultValue>false</defaultValue>
         </hudson.model.BooleanParameterDefinition>
       </parameterDefinitions>

=== modified file 'daily-release/jenkins-templates/prepare-project-config.xml.tmpl'
--- daily-release/jenkins-templates/prepare-project-config.xml.tmpl	2013-07-17 11:17:27 +0000
+++ daily-release/jenkins-templates/prepare-project-config.xml.tmpl	2013-07-17 11:17:27 +0000
@@ -47,6 +47,10 @@
     OPTS="$OPTS -f"
 fi
 
+if [ "$SKIP_DEST_CHECK" = "true" ]; then
+    OPTS="$OPTS --skip-dest-check"
+fi
+
 # WS Clean-up
 rm -f *xml