Merge lp:~dave-cheney/juju-core/153-fix-release-tools-script into lp:~go-bot/juju-core/trunk

[Dave Cheney]

fix release tarballs script

Because T is closer to the end of the alphabet than the start, the lp boffins have changed build recipes to pass a version number, not the series name.

fix release tarballs script

Because T is closer to the end of the alphabet than the start, the lp boffins have changed build recipes to pass a version number, not the series name.

https://codereview.appspot.com/13254045/

[Ian Booth (wallyworld)]

LGTM

https://codereview.appspot.com/13254045/

[William Reade (fwereade)]

Is this blocked?

[Go Bot (go-bot)]

The attempt to merge lp:~dave-cheney/juju-core/153-fix-release-tools-script into lp:juju-core failed. Below is the output from the failed tests.

ok launchpad.net/juju-core/agent 0.758s
ok launchpad.net/juju-core/agent/tools 0.248s
ok launchpad.net/juju-core/bzr 7.269s
ok launchpad.net/juju-core/cert 2.587s
ok launchpad.net/juju-core/charm 0.584s
? launchpad.net/juju-core/charm/hooks [no test files]
ok launchpad.net/juju-core/cloudinit 0.021s
ok launchpad.net/juju-core/cmd 0.286s
? launchpad.net/juju-core/cmd/builddb [no test files]
? launchpad.net/juju-core/cmd/charmd [no test files]
? launchpad.net/juju-core/cmd/charmload [no test files]
ok launchpad.net/juju-core/cmd/juju 136.618s
ok launchpad.net/juju-core/cmd/jujud 39.656s
ok launchpad.net/juju-core/cmd/plugins/juju-metadata 1.908s
ok launchpad.net/juju-core/constraints 0.026s
ok launchpad.net/juju-core/container/lxc 0.304s
? launchpad.net/juju-core/container/lxc/mock [no test files]
ok launchpad.net/juju-core/downloader 5.256s
ok launchpad.net/juju-core/environs 1.782s
ok launchpad.net/juju-core/environs/bootstrap 5.066s
ok launchpad.net/juju-core/environs/cloudinit 0.430s
ok launchpad.net/juju-core/environs/config 0.850s
ok launchpad.net/juju-core/environs/filestorage 0.062s
ok launchpad.net/juju-core/environs/imagemetadata 0.526s
ok launchpad.net/juju-core/environs/instances 0.264s
ok launchpad.net/juju-core/environs/jujutest 0.236s
ok launchpad.net/juju-core/environs/localstorage 0.251s
ok launchpad.net/juju-core/environs/manual 0.969s
ok launchpad.net/juju-core/environs/simplestreams 0.338s
? launchpad.net/juju-core/environs/simplestreams/testing [no test files]
ok launchpad.net/juju-core/environs/sync 0.286s
ok launchpad.net/juju-core/environs/testing 0.010s
ok launchpad.net/juju-core/environs/tools 34.243s
? launchpad.net/juju-core/environs/tools/testing [no test files]
? launchpad.net/juju-core/errors [no test files]
ok launchpad.net/juju-core/instance 0.025s
ok launchpad.net/juju-core/juju 17.291s
ok launchpad.net/juju-core/juju/osenv 0.205s
? launchpad.net/juju-core/juju/testing [no test files]
ok launchpad.net/juju-core/log 0.015s
ok launchpad.net/juju-core/log/syslog 0.020s
ok launchpad.net/juju-core/names 0.041s
ok launchpad.net/juju-core/provider 0.268s
? launchpad.net/juju-core/provider/all [no test files]
ok launchpad.net/juju-core/provider/azure 6.366s
ok launchpad.net/juju-core/provider/dummy 19.248s
ok launchpad.net/juju-core/provider/ec2 5.387s
ok launchpad.net/juju-core/provider/local 1.810s
? launchpad.net/juju-core/provider/local/storage [no test files]
ok launchpad.net/juju-core/provider/maas 3.670s
ok launchpad.net/juju-core/provider/openstack 4.807s
ok launchpad.net/juju-core/rpc 0.241s
ok launchpad.net/juju-core/rpc/jsoncodec 0.212s
ok launchpad.net/juju-core/schema 0.018s
ok launchpad.net/juju-core/state 70.308s
ok launchpad.net/juju-core/state/api 1.552s
ok launchpad.net/juju-core/state/api/agent 2.025s
? launchpad.net/juju-core/state/api/common [no test files]
ok launchpad.net/juju-core/state/api/deployer 5.853s
ok launchpad.net...

[William Reade (fwereade)]

Gaah, lp:1064909 -- reapproving.

[Go Bot (go-bot)]

Attempt to merge into lp:juju-core failed due to conflicts:

text conflict in scripts/release-public-tools/release-public-tools.sh

[William Reade (fwereade)]

Should this be landing? WIPping it to clear out +activereviews

Unmerged revisions

1750. By Dave Cheney on 2013-09-03

fix release tools script

=== modified file 'scripts/release-public-tools/release-public-tools.sh'
--- scripts/release-public-tools/release-public-tools.sh	2013-07-01 02:17:19 +0000
+++ scripts/release-public-tools/release-public-tools.sh	2013-09-03 01:37:35 +0000
@@ -26,10 +26,23 @@
 	exit 2
 fi
 
-SERIES=$(sed -n 's/^Version: \([0-9]\+\).\([0-9]\+\).\([0-9]\+\)-[0-9]\+~\([0-9]\+\)~\([a-Z]\+\).*/\5/p' ${WORK}/juju/control)
+SERIES=$(sed -n 's/^Version: \([0-9]\+\).\([0-9]\+\).\([0-9]\+\)-[0-9]\+~\([0-9]\+\)~\([a-Z]\+[0-9]\+.[0-9]\+\).*/\5/p' ${WORK}/juju/control)
 case "${SERIES}" in 
 	"precise" | "quantal" | "raring" | "saucy" )
 		;;
+	# lp started to produce builds with numbers not series
+	"ubuntu12.04" )
+		SERIES="precise"
+		;;
+	"ubuntu12.10" )
+		SERIES="quantal"
+		;; 
+	"ubuntu13.04" )
+		SERIES="raring"
+		;;
+	"ubuntu13.10" )
+		SERIES="saucy"
+		;;
 	*)
 		echo "invalid series"
 		exit 2