Update templates for updated Jinja substitution variables.

ci/jobgenerator.py

@@ -201,8 +201,7 @@ class Generator:
 
             package_config = template.render(PACKAGING_URL=url,
                                              MERGE_COMMANDS=cascade,
-                                             NAME=data["name"],
-                                             DEFAULT_BRANCH=cascading[0])
+                                             NAME=data["name"])
         elif job_type == "release-mgmt":
             package_config = template.render()
         else:

templates/merger.xml

@@ -13,7 +13,7 @@
     </userRemoteConfigs>
     <branches>
       <hudson.plugins.git.BranchSpec>
-        <name>*/{{ DEFAULT_BRANCH }}</name>
+        <name>**</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
     <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>

templates/package-stable.xml

@@ -25,7 +25,7 @@
     </userRemoteConfigs>
     <branches>
       <hudson.plugins.git.BranchSpec>
-        <name>*/{{ PACKAGING_BRANCH_S }}</name>
+        <name>*/{{ PACKAGING_BRANCH }}</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
     <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -62,7 +62,7 @@ export DEBFULLNAME="Lugito"
 export DEBEMAIL="info@lubuntu.me"
 (cd {{ NAME }}; uscan --download-current-version)
 bash -c 'for FILENAME in {{ NAME }}_$UPSTREAM_VERSION.orig*; do mv $FILENAME $(echo $FILENAME | sed "s/$UPSTREAM_VERSION/$VERSION/"); done'
-(cd {{ NAME }}; dch --distribution {{ RELEASE }} --package "{{ NAME }}" --newversion "$VERSION-0ubuntu1~ppa1" "CI upload."; debuild -S -d -sa -k06DA7DDBBF3117FFE3FB849E4F81E626A09EB338; dput {{ UPLOAD_TARGET_S }} ../{{ NAME }}_$VERSION-0ubuntu1~ppa1_source.changes)
+(cd {{ NAME }}; dch --distribution {{ RELEASE }} --package "{{ NAME }}" --newversion "$VERSION-0ubuntu1~ppa1" "CI upload."; debuild -S -d -sa -k06DA7DDBBF3117FFE3FB849E4F81E626A09EB338; dput {{ UPLOAD_TARGET }} ../{{ NAME }}_$VERSION-0ubuntu1~ppa1_source.changes)
 sleep 5m;
 git clone https://phab.lubuntu.me/source/ci-tooling.git tooling;
 ./tooling/ci/lp_check.py -p {{ NAME }} -v $VERSION-0ubuntu1~ppa1 -t lubuntu-ci -r stable-ci-proposed;

templates/package-unstable.xml

@@ -25,7 +25,7 @@
     </userRemoteConfigs>
     <branches>
       <hudson.plugins.git.BranchSpec>
-        <name>*/{{ PACKAGING_BRANCH_U }}</name>
+        <name>*/{{ PACKAGING_BRANCH }}</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
     <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -62,7 +62,7 @@ export DEBFULLNAME="Lugito"
 export DEBEMAIL="info@lubuntu.me"
 tar cvf {{ NAME }}_$VERSION.orig.tar upstream;
 gzip {{ NAME }}_$VERSION.orig.tar;
-(cd {{ NAME }}; dch --distribution {{ RELEASE }} --package "{{ NAME }}" --newversion "$VERSION-0ubuntu1~ppa1" "CI upload."; debuild -S -d -sa -k06DA7DDBBF3117FFE3FB849E4F81E626A09EB338; dput {{ UPLOAD_TARGET_U }} ../{{ NAME }}_$VERSION-0ubuntu1~ppa1_source.changes)
+(cd {{ NAME }}; dch --distribution {{ RELEASE }} --package "{{ NAME }}" --newversion "$VERSION-0ubuntu1~ppa1" "CI upload."; debuild -S -d -sa -k06DA7DDBBF3117FFE3FB849E4F81E626A09EB338; dput {{ UPLOAD_TARGET }} ../{{ NAME }}_$VERSION-0ubuntu1~ppa1_source.changes)
 sleep 5m;
 git clone https://phab.lubuntu.me/source/ci-tooling.git tooling;
 ./tooling/ci/lp_check.py -p {{ NAME }} -v $VERSION-0ubuntu1~ppa1 -t lubuntu-ci -r unstable-ci-proposed;