diff --git a/ci/jobgenerator.py b/ci/jobgenerator.py index 9665d6a..8bb9f78 100755 --- a/ci/jobgenerator.py +++ b/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: diff --git a/templates/merger.xml b/templates/merger.xml index 40044c9..ebc8426 100644 --- a/templates/merger.xml +++ b/templates/merger.xml @@ -13,7 +13,7 @@ - */{{ DEFAULT_BRANCH }} + ** false diff --git a/templates/package-stable.xml b/templates/package-stable.xml index 795e189..63127b1 100644 --- a/templates/package-stable.xml +++ b/templates/package-stable.xml @@ -25,7 +25,7 @@ - */{{ PACKAGING_BRANCH_S }} + */{{ PACKAGING_BRANCH }} false @@ -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; diff --git a/templates/package-unstable.xml b/templates/package-unstable.xml index ff4d00f..1b0c66b 100644 --- a/templates/package-unstable.xml +++ b/templates/package-unstable.xml @@ -25,7 +25,7 @@ - */{{ PACKAGING_BRANCH_U }} + */{{ PACKAGING_BRANCH }} false @@ -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;