Only build the source package for one suite

Change-Id: I5fa31bd97d6825e2c267fa2d8da45d14ee1ee556

6 files changed, 35 insertions, 11 deletions

diff --git a/bin/builder.lib b/bin/builder.lib
index f97b036..c1a7180 100644
--- a/bin/builder.lib
+++ b/bin/builder.lib
@@ -29,7 +29,7 @@
 # SCHROOT=jessie
 # BACKPORTS_SUITE=jessie-backports
 # GIT_DEBIAN_BRANCH=backports
-
+# SOURCE="-s"
 # SECOND_SUITE=stretch
 # SECOND_SCHROOT=stretch
 # SECOND_BUILD=stretch
@@ -98,7 +98,7 @@ dch --force-distribution -v ${VERSION}-1+${BUILD_SUITE} -D ${BACKPORTS_SUITE} ${
 if [ -n "${LOG}" ]; then
     dch -a ${LOG}
 fi
-sbuild --build-dep-resolver=aptitude --force-orig-source -A -s -c ${schroot} -d ${suite}
+sbuild --build-dep-resolver=aptitude --force-orig-source -A ${SOURCE} -c ${schroot} -d ${suite}
 reprepro --ignore=wrongdistribution -b ${REPO_DIR} include ${BACKPORTS_SUITE} ${DIR}/${NAME}_${VERSION}-1+${BUILD_SUITE}_${host_arch}.changes
 if [ -n "$arch" ]; then
     sbuild --arch ${arch} -c ${schroot}-${arch} -d ${suite}
@@ -111,7 +111,7 @@ if [ -n "${SECOND_SUITE}" ]; then
     schroot=${SECOND_SCHROOT}
     backports=${SECOND_BACKPORTS}
     # second build without orig.tar.gz
-    sbuild --build-dep-resolver=aptitude -A -s -c ${schroot} -d ${suite}
+    sbuild --build-dep-resolver=aptitude -A ${SOURCE} -c ${schroot} -d ${suite}
     reprepro --ignore=wrongdistribution -b ${REPO_DIR} include ${SECOND_BACKPORTS} ${DIR}/${NAME}_${VERSION}-1+${SECOND_BUILD}_${host_arch}.changes
     if [ -n "$arch" ]; then
         sbuild --arch ${arch} -c ${schroot}-${arch} -d ${suite}
diff --git a/bin/daily-build.sh b/bin/daily-build.sh
index 8c06369..67ef99f 100755
--- a/bin/daily-build.sh
+++ b/bin/daily-build.sh
@@ -3,9 +3,11 @@
 set -e
 
 # build lava-dispatcher packages for debian, quietly
+/home/buildd/bin/debian-tip-build-stretch.sh lava-dispatcher >/dev/null 2>&1
 /home/buildd/bin/debian-tip-build.sh lava-dispatcher >/dev/null 2>&1
 
 # build lava-server packages for debian, quietly
+/home/buildd/bin/debian-tip-build-stretch.sh lava-server >/dev/null 2>&1
 /home/buildd/bin/debian-tip-build.sh lava-server >/dev/null 2>&1
 
 # make above packages available in daily-repo
diff --git a/bin/debian-tip-build-stretch.sh b/bin/debian-tip-build-stretch.sh
new file mode 100755
index 0000000..7b59ea6
--- /dev/null
+++ b/bin/debian-tip-build-stretch.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+set -e
+
+BUILDD_BIN=/home/buildd/bin/
+GIT_TREE_DIR=/home/buildd/git/
+GIT_BRANCH=master
+LATEST_SUFFIX='stretch'
+CHANGELOG_ENTRY="Staging incremental build"
+REPO_DIR=/home/buildd/debian
+SUITE=stretch
+BUILD_SUITE=stretch
+SCHROOT=stretch
+BACKPORTS_SUITE=stretch-backports
+GIT_DEBIAN_BRANCH=master
+SOURCE='-s'
+
+if [ -z "$1" ]; then
+	echo "Usage: <package> [<architecture>]"
+	echo "If architecture is a known Debian architecture, build"
+	echo "a binary-only package for this architecture."
+	echo "armhf is currently supported."
+	exit 1
+fi
+
+. ${BUILDD_BIN}builder.lib
diff --git a/bin/debian-tip-build.sh b/bin/debian-tip-build.sh
index 2297250..aa2891f 100755
--- a/bin/debian-tip-build.sh
+++ b/bin/debian-tip-build.sh
@@ -12,12 +12,8 @@ SUITE=jessie
 BUILD_SUITE=jessie
 SCHROOT=jessie
 BACKPORTS_SUITE=jessie-backports
-SECOND_SUITE=stretch
-SECOND_BUILD=stretch
-SECOND_SCHROOT=stretch
-SECOND_BACKPORTS=stretch-backports
-# enables Python2 and Python3 until Python2 support is removed.
-GIT_DEBIAN_BRANCH=master
+GIT_DEBIAN_BRANCH=backports
+SOURCE=''
 
 if [ -z "$1" ]; then
 	echo "Usage: <package> [<architecture>]"
diff --git a/bin/dispatcher-submit.py b/bin/dispatcher-submit.py
index 54e340d..a241fe3 100755
--- a/bin/dispatcher-submit.py
+++ b/bin/dispatcher-submit.py
@@ -12,7 +12,7 @@ with open('/home/buildd/tokens/production.token') as auth:
     production_token = "%s" % auth.read().split('\n')[0]
 
 # preserve comments
-with open("/home/buildd/refactoring/functional/lxc-dispatcher-pipeline.yaml") as f:
+with open("/home/buildd/refactoring/functional/lxc-dispatcher-stretch.yaml") as f:
     data = f.read()
 server = xmlrpclib.ServerProxy("http://lavabuildd:%s@staging.validation.linaro.org/RPC2/" % staging_token)
 server.scheduler.submit_job(data)
diff --git a/bin/server-submit.py b/bin/server-submit.py
index f95bb09..99e4382 100755
--- a/bin/server-submit.py
+++ b/bin/server-submit.py
@@ -10,7 +10,7 @@ with open('/home/buildd/tokens/staging.token') as auth:
 with open('/home/buildd/tokens/production.token') as auth:
     production_token = "%s" % auth.read().split('\n')[0]
 
-with open("/home/buildd/refactoring/functional/lxc-server-pipeline.yaml") as f:
+with open("/home/buildd/refactoring/functional/lxc-server-stretch.yaml") as f:
     config = f.read()
 
 server = xmlrpclib.ServerProxy("http://lavabuildd:%s@staging.validation.linaro.org/RPC2/" % staging_token)