From eb286afbdddec84ac777c681933a59053d302cd8 Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Sat, 13 Apr 2019 14:44:58 -0500 Subject: [PATCH] Sleep for five minutes instead of two. There's no way the build is uploaded, done, and published in two minutes, let alone five, so there's little downside. This fixes the race condition where Launchpad hasn't even reviewed the upload in the queue in two minutes, and since we're already checking every five minutes, this time gap makes sense. --- templates/package-stable.xml | 2 +- templates/package-unstable.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/package-stable.xml b/templates/package-stable.xml index 284d47e..b87f05d 100644 --- a/templates/package-stable.xml +++ b/templates/package-stable.xml @@ -51,7 +51,7 @@ 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 -k959BC9B671870639A1AC6E2F7FE7CC578F23E4CA; dput {{ UPLOAD_TARGET_S }} ../{{ NAME }}_$VERSION-0ubuntu1~ppa1_source.changes) -sleep 2m; +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 90a54e8..7ae32cc 100644 --- a/templates/package-unstable.xml +++ b/templates/package-unstable.xml @@ -51,7 +51,7 @@ 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 -k959BC9B671870639A1AC6E2F7FE7CC578F23E4CA; dput {{ UPLOAD_TARGET_U }} ../{{ NAME }}_$VERSION-0ubuntu1~ppa1_source.changes) -sleep 2m; +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;