Merge lp:~robru/ubuntu-ui-toolkit/gles-experiment into lp:ubuntu-ui-toolkit/gles

[Robert Bruce Park]

Packaging experiment.

[lp:~robru/ubuntu-ui-toolkit/gles-experiment]

86. By Robert Bruce Park on 2015-10-08

Try not hard-coding jenkins home.

[Robert Bruce Park (robru)]

This works for me locally, except for the fact that I don't actually have the files locally for it to work. I'm testing this in the train except it's blocked by an unrelated bug, so I'll come back to this later:

https://requests.ci-train.ubuntu.com/#/ticket/497

[lp:~robru/ubuntu-ui-toolkit/gles-experiment]

87. By Robert Bruce Park on 2015-10-08

Feedback from slangasek.

88. By Robert Bruce Park on 2015-10-08

More feedback from slangasek.

[Robert Bruce Park (robru)]

Unknowns:

I'm not sure if the train passes the $SILONAME env var down into the chroot where this code will run. I might need to modify the train to pass that through if it doesn't already work.

I'm also not sure if ~ will expand to the right thing inside the chroot.

Hopefully these things aren't problems / are easily overcome so that we can stop hard-coding silonames into the packaging, so it works without changes in any silo.

[lp:~robru/ubuntu-ui-toolkit/gles-experiment]

89. By Robert Bruce Park on 2015-10-09

Let train pick versions.

[Robert Bruce Park (robru)]

Quite strange, the build log distinctly shows this working:

cp -v ~/silos/ubuntu/landing-060/ubuntu-ui-toolkit_1.3.1676+15.10.20151009.orig.tar.gz \
      ~/silos/ubuntu/landing-060/ubuntu-ui-toolkit-gles_1.3.1676+15.10.20151009.orig.tar.gz
'/var/lib/jenkins/silos/ubuntu/landing-060/ubuntu-ui-toolkit_1.3.1676+15.10.20151009.orig.tar.gz' -> '/var/lib/jenkins/silos/ubuntu/landing-060/ubuntu-ui-toolkit-gles_1.3.1676+15.10.20151009.orig.tar.gz'

But then the log later goes on to say:

Trying to use get-orig-source to retrieve needed tarball (deprecated).
get-orig-source did not create file for ubuntu-ui-toolkit-gles version 1.3.1676+15.10.20151009
Using uscan to look for the upstream tarball.
No watch file to use to retrieve upstream tarball.
bzr: ERROR: Unable to find the needed upstream tarball for package ubuntu-ui-toolkit-gles, version 1.3.1676+15.10.20151009.

But the train definitely has the files:

ls /var/lib/jenkins/silos/ubuntu/landing-060/*.orig.tar.gz
/var/lib/jenkins/silos/ubuntu/landing-060/ubuntu-ui-toolkit_1.3.1676+15.10.20151009.orig.tar.gz
/var/lib/jenkins/silos/ubuntu/landing-060/ubuntu-ui-toolkit-gles_1.3.1676+15.10.20151009.orig.tar.gz

[Robert Bruce Park (robru)]

Doesn't seem to be a permissions issue either, both files are 644 and owned by jenkins:jenkins.

Here's the original log:

https://ci-train.ubuntu.com/job/ubuntu-landing-060-1-build/16/console

[lp:~robru/ubuntu-ui-toolkit/gles-experiment]

90. By Robert Bruce Park on 2015-10-09

Maybe if I...

91. By Robert Bruce Park on 2015-10-09

But what about...

[Robert Bruce Park (robru)]

Ok this is now working.

review: Approve

[Robert Bruce Park (robru)]

No need to release this to ubuntu as it doesn't have any user-facing effect but it should be merged to trunk so we have it for the next release.

[lp:~robru/ubuntu-ui-toolkit/gles-experiment]

92. By Robert Bruce Park on 2015-10-09

Add comment.

93. By Robert Bruce Park on 2015-10-09

Stop hard-coding package name.

=== modified file 'debian/control'
--- debian/control	2015-09-28 15:49:18 +0000
+++ debian/control	2015-10-09 16:56:18 +0000
@@ -58,7 +58,6 @@
                libqt5quickwidgets5-gles,
                liblttng-ust-dev,
 Standards-Version: 3.9.4
-X-Auto-Uploader: no-rewrite-version
 Homepage: https://launchpad.net/ubuntu-ui-toolkit
 
 Package: qtdeclarative5-ubuntu-ui-toolkit-plugin-gles

=== modified file 'debian/rules'
--- debian/rules	2015-08-03 13:28:04 +0000
+++ debian/rules	2015-10-09 16:56:18 +0000
@@ -1,5 +1,8 @@
 #!/usr/bin/make -f
 
+VERSION := $(shell dpkg-parsechangelog | sed -n -e's/^Version: \(.*\)-[^-]\+/\1/p')
+SOURCE := $(shell dpkg-parsechangelog | sed -n -e's/^Source: \(.*\)-gles/\1/p')
+
 # Uncomment this to turn on verbose mode.
 # export DH_VERBOSE=1
 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
@@ -10,6 +13,12 @@
 CONFIGURE_SWITCHES = "-r" \
                      "ROOT_SOURCE_DIR=$(CURDIR)" \
                      "ROOT_BUILD_DIR=$(CURDIR)" 
+
+# Don't try this at /home/: It will only work within https://ci-train.ubuntu.com
+get-orig-source:
+	cp -v ~/silos/$(SILONAME)/$(SOURCE)_$(VERSION).orig.tar.gz \
+	      $(CURDIR)/$(SOURCE)-gles_$(VERSION).orig.tar.gz
+
 %:
 	dh $@
 

=== removed file 'debian/watch'
--- debian/watch	2015-10-08 11:00:54 +0000
+++ debian/watch	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-version=3
-opts=dversionmangle=s/\-gles// \
-http://ppa.launchpad.net/ci-train-ppa-service/landing-023/ubuntu/pool/main/u/ubuntu-ui-toolkit/ubuntu-ui-toolkit_([^-]*)\.orig.tar.gz