Lubuntu/ci-tooling
8
0
Fork 0
mirror of https://github.com/lubuntu-team/ci-tooling.git synced 2025-05-03 22:01:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update templates for updated Jinja substitution variables.

Browse Source
This commit is contained in:
Simon Quigley 2020-06-05 12:49:00 -05:00
parent 5f198dc770
commit fc9e24b62b
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ci/jobgenerator.py
View File

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

2
templates/merger.xml
View File

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

4
templates/package-stable.xml
View File

@ -25,7 +25,7 @@
</userRemoteConfigs> </userRemoteConfigs>
<branches> <branches>
<hudson.plugins.git.BranchSpec> <hudson.plugins.git.BranchSpec>
<name>*/{{ PACKAGING_BRANCH_S }}</name> <name>*/{{ PACKAGING_BRANCH }}</name>
</hudson.plugins.git.BranchSpec> </hudson.plugins.git.BranchSpec>
</branches> </branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations> <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@ -62,7 +62,7 @@ export DEBFULLNAME="Lugito"
export DEBEMAIL="info@lubuntu.me" export DEBEMAIL="info@lubuntu.me"
(cd {{ NAME }}; uscan --download-current-version) (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' 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; sleep 5m;
git clone https://phab.lubuntu.me/source/ci-tooling.git tooling; 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; ./tooling/ci/lp_check.py -p {{ NAME }} -v $VERSION-0ubuntu1~ppa1 -t lubuntu-ci -r stable-ci-proposed;

4
templates/package-unstable.xml
View File

@ -25,7 +25,7 @@
</userRemoteConfigs> </userRemoteConfigs>
<branches> <branches>
<hudson.plugins.git.BranchSpec> <hudson.plugins.git.BranchSpec>
<name>*/{{ PACKAGING_BRANCH_U }}</name> <name>*/{{ PACKAGING_BRANCH }}</name>
</hudson.plugins.git.BranchSpec> </hudson.plugins.git.BranchSpec>
</branches> </branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations> <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@ -62,7 +62,7 @@ export DEBFULLNAME="Lugito"
export DEBEMAIL="info@lubuntu.me" export DEBEMAIL="info@lubuntu.me"
tar cvf {{ NAME }}_$VERSION.orig.tar upstream; tar cvf {{ NAME }}_$VERSION.orig.tar upstream;
gzip {{ NAME }}_$VERSION.orig.tar; 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; sleep 5m;
git clone https://phab.lubuntu.me/source/ci-tooling.git tooling; 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; ./tooling/ci/lp_check.py -p {{ NAME }} -v $VERSION-0ubuntu1~ppa1 -t lubuntu-ci -r unstable-ci-proposed;