Merge lp:~nskaggs/juju-release-tools/add-epoch into lp:juju-release-tools

[Nicholas Skaggs]

Fix for bug 1619396. Add epoch to version strings.

[lp:~nskaggs/juju-release-tools/add-epoch]

338. By Nicholas Skaggs on 2016-09-09

make epoch default to 1

[Curtis Hovey (sinzui)]

Thank you.

review: Approve (code)

[Nicholas Skaggs (nskaggs)]

+ dch --newversion 1:2.0-beta18~0ubuntu1~12.04.1~juju1 -D precise --force-distribution New upstream devel release. (LP #1)
+ debcommit
bzr commit -m 'New upstream devel release. (LP #1)'
Committing to: /mnt/jenkins/workspace/balloons-release-juju-create-source-packages/juju-build-precise-all/source/
modified debian/changelog
Committed revision 140.
+ bzr bd -S -- -us -uc
Building using working tree
Building package in normal mode
Looking for a way to retrieve the upstream tarball
Using apt to look for the upstream tarball.
apt could not find the needed tarball.
Trying to use get-packaged-orig-source to retrieve needed tarball.
dh get-packaged-orig-source
dh: Unknown sequence get-packaged-orig-source (choose from: binary binary-arch binary-indep build build-arch build-indep clean install install-arch install-indep)
debian/rules:23: recipe for target 'get-packaged-orig-source' failed
make: *** [get-packaged-orig-source] Error 2
Trying to run get-packaged-orig-source rule failed
Trying to use get-orig-source to retrieve needed tarball (deprecated).
dh get-orig-source
dh: Unknown sequence get-orig-source (choose from: binary binary-arch binary-indep build build-arch build-indep clean install install-arch install-indep)
debian/rules:23: recipe for target 'get-orig-source' failed
make: *** [get-orig-source] Error 2
Trying to run get-orig-source rule failed
Using uscan to look for the upstream tarball.
uscan warn: In /tmp/tmpVtgMO5 no matching hrefs for version 2.0 in watch line
  https://launchpad.net/juju-core/+download https://launchpad.net/juju-core/.*/.*/.*/juju-core_(.*)\.tar\.gz
uscan could not find the needed tarball.
bzr: ERROR: Unable to find the needed upstream tarball for package juju-core, version 2.0.
Creating /mnt/jenkins/workspace/balloons-release-juju-create-source-packages/juju-build-any-all
Copying juju-core_2.0-beta18.tar.gz to /mnt/jenkins/workspace/balloons-release-juju-create-source-packages/juju-build-any-all
Creating /mnt/jenkins/workspace/balloons-release-juju-create-source-packages/juju-build-precise-all
Traceback (most recent call last):
  File "/var/lib/jenkins/juju-release-tools/build_package_test.py", line 584, in <module>
    sys.exit(main(sys.argv))
  File "/var/lib/jenkins/juju-release-tools/build_package_test.py", line 513, in main
    revid=args.revid, epoch=args.epoch)
  File "/var/lib/jenkins/juju-release-tools/build_package_test.py", line 489, in build_source
    date=date, build=build, revid=revid, epoch=epoch)
  File "/var/lib/jenkins/juju-release-tools/build_package_test.py", line 432, in create_source_package
    subprocess.check_call([script], shell=True, cwd=source_dir, env=env)
  File "/usr/lib/python2.7/subprocess.py", line 541, in check_call
    raise CalledProcessError(retcode, cmd)

[Curtis Hovey (sinzui)]

Why are you looking at the juju 1.x project (juju-core). Juju 2.x is published in the juju project.
    https://launchpad.net/juju/2.0/2.0-beta18

[Nicholas Skaggs (nskaggs)]

I ran a new one with http://juju-ci.vapour.ws:8080/view/Experiments/job/balloons-release-juju-create-source-packages/6/console. I believe this issue is encountered because we haven't released anything new since the juju-core -> juju switch into the archive.

Since we call the package juju-core, bzr-bd looks at the juju-core project for an upstream tarball.

Curiously the actual run does this fine:

bzr bd -S -- -us -uc
Building using working tree
Building package in normal mode
Looking for a way to retrieve the upstream tarball
Using pristine-tar to reconstruct juju-core_2.0-rc1.orig.tar.gz.

=== modified file 'build_package.py'
--- build_package.py	2016-07-15 21:49:02 +0000
+++ build_package.py	2016-09-09 21:33:08 +0000
@@ -115,8 +115,8 @@
 DEBSIGN_TEMPLATE = 'debsign -p {gpgcmd} *.changes'
 
 
-UBUNTU_VERSION_TEMPLATE = '{version}-0ubuntu1~{release}.{upatch}~juju1'
-DAILY_VERSION_TEMPLATE = '{version}-{date}+{build}+{revid}~{release}'
+UBUNTU_VERSION_TEMPLATE = '{epoch}:{version}~0ubuntu1~{release}.{upatch}~juju1'
+DAILY_VERSION_TEMPLATE = '{epoch}:{version}~{date}+{build}+{revid}~{release}'
 
 
 VERSION_PATTERN = re.compile('(\d+)\.(\d+)\.(\d+)')
@@ -320,7 +320,7 @@
 
 
 def make_ubuntu_version(series, version, upatch=1,
-                        date=None, build=None, revid=None):
+                        date=None, build=None, revid=None, epoch=1):
     """Return an Ubuntu package version.
 
     :param series: The series codename.
@@ -330,17 +330,18 @@
     :param date: The date of the build.
     :param build: The build number in CI.
     :param revid: The revid hash of the source.
+    :param epoch: The epoch to pass in version name
     :return: An Ubuntu version string.
     """
     release = juju_series.get_version(series)
     # if daily params are set, we make daily build
     if all([date, build, revid]):
         return DAILY_VERSION_TEMPLATE.format(
-            version=version, release=release, upatch=upatch,
+            epoch=epoch, version=version, release=release, upatch=upatch,
             date=date, build=build, revid=revid)
     else:
         return UBUNTU_VERSION_TEMPLATE.format(
-            version=version, release=release, upatch=upatch)
+            epoch=epoch, version=version, release=release, upatch=upatch)
 
 
 def make_changelog_message(version, bugs=None):
@@ -396,7 +397,7 @@
 def create_source_package(source_dir, spb, series, version,
                           upatch='1', bugs=None, gpgcmd=None, debemail=None,
                           debfullname=None, verbose=False,
-                          date=None, build=None, revid=None):
+                          date=None, build=None, revid=None, epoch=1):
     """Create a series source package from a source package branch.
 
     The new source package can be used to create series source packages.
@@ -417,10 +418,11 @@
     :param date: The date of the build.
     :param build: The build number in CI.
     :param revid: The revid hash of the source.
+    :param epoch: The epoch to pass in version name
     """
 
     ubuntu_version = make_ubuntu_version(series, version, upatch,
-                                         date, build, revid)
+                                         date, build, revid, epoch)
     message = make_changelog_message(version, bugs=bugs)
     source = os.path.join(source_dir, 'source')
     env = make_deb_shell_env(debemail, debfullname)
@@ -435,7 +437,7 @@
 def build_source(tarfile_path, location, series, bugs,
                  debemail=None, debfullname=None, gpgcmd=None,
                  branch=None, upatch=1, verbose=False,
-                 date=None, build=None, revid=None):
+                 date=None, build=None, revid=None, epoch=1):
     """Build one or more series source packages from a new release tarfile.
 
     The packages are unsigned by default, but providing the path to a gpgcmd,
@@ -457,6 +459,7 @@
     :param date: The date of the build.
     :param build: The build number in CI.
     :param revid: The revid hash of the source.
+    :param epoch: The epoch to pass in version name
     :return: the exit code (which is 0 or else an exception was raised).
     """
     if not isinstance(series, list):
@@ -483,7 +486,7 @@
             build_dir, spb, a_series, version,
             upatch=upatch, bugs=bugs, gpgcmd=gpgcmd,
             debemail=debemail, debfullname=debfullname, verbose=verbose,
-            date=date, build=build, revid=revid)
+            date=date, build=build, revid=revid, epoch=epoch)
     return 0
 
 
@@ -506,8 +509,8 @@
             args.tar_file, args.location, args.series, args.bugs,
             debemail=args.debemail, debfullname=args.debfullname,
             gpgcmd=args.gpgcmd, branch=args.branch, upatch=args.upatch,
-            verbose=args.verbose,
-            date=args.date, build=args.build, revid=args.revid)
+            verbose=args.verbose, date=args.date, build=args.build,
+            revid=args.revid, epoch=args.epoch)
     elif args.command == 'binary':
         exitcode = build_binary(
             args.dsc, args.location, args.series, args.arch,
@@ -533,6 +536,8 @@
         '--debfullname', default=os.environ.get("DEBFULLNAME"),
         help="Your full name; Environment: DEBFULLNAME.")
     src_parser.add_argument(
+        '--epoch', default='1', help="The epoch for package version")
+    src_parser.add_argument(
         '--gpgcmd', default=None,
         help="Path to a gpg signing command to make signed packages.")
     src_parser.add_argument(

=== modified file 'tests/test_build_package.py'
--- tests/test_build_package.py	2016-07-21 14:01:00 +0000
+++ tests/test_build_package.py	2016-09-09 21:33:08 +0000
@@ -334,9 +334,9 @@
 
     def test_make_ubuntu_version(self):
         ubuntu_version = make_ubuntu_version('trusty', '1.2.3')
-        self.assertEqual('1.2.3-0ubuntu1~14.04.1~juju1', ubuntu_version)
-        ubuntu_version = make_ubuntu_version('precise', '1.22-alpha1', '8')
-        self.assertEqual('1.22-alpha1-0ubuntu1~12.04.8~juju1', ubuntu_version)
+        self.assertEqual('1:1.2.3~0ubuntu1~14.04.1~juju1', ubuntu_version)
+        ubuntu_version = make_ubuntu_version('precise', '1.22~alpha1', '8')
+        self.assertEqual('1:1.22~alpha1~0ubuntu1~12.04.8~juju1', ubuntu_version)
 
     def test_make_changelog_message(self):
         message = make_changelog_message('1.2.0')
@@ -397,6 +397,7 @@
     scenarios = [
         ('release',
             {'date': None,
+             'epoch': '2',
              'build': None,
              'revid': None,
              'version': '1.2.3',
@@ -407,6 +408,7 @@
 
         ('daily',
             {'date': '20160502',
+             'epoch': None,
              'build': '3065',
              'revid': '4bbce805',
              'version': '1.2.3~20160502~3065~4bbce805',
@@ -416,6 +418,7 @@
              }),
         ('broken_daily',
             {'date': None,
+             'epoch': None,
              'build': '3065',
              'revid': '4bbce805',
              'version': '1.2.3',
@@ -458,22 +461,25 @@
     scenarios = [
         ('release',
             {'date': None,
+             'epoch': '1',
              'build': None,
              'revid': None,
-             'ubuntu_version': '1.2.3-0ubuntu1~14.04.1~juju1'
+             'ubuntu_version': '1:1.2.3~0ubuntu1~14.04.1~juju1'
              }),
 
         ('daily',
             {'date': '20160502',
+             'epoch': '2',
              'build': '3065',
              'revid': '4bbce805',
-             'ubuntu_version': '1.2.3-20160502+3065+4bbce805~14.04'
+             'ubuntu_version': '2:1.2.3~20160502+3065+4bbce805~14.04'
              }),
         ('broken_daily',
             {'date': None,
+             'epoch': '1',
              'build': '3065',
              'revid': '4bbce805',
-             'ubuntu_version': '1.2.3-0ubuntu1~14.04.1~juju1'
+             'ubuntu_version': '1:1.2.3~0ubuntu1~14.04.1~juju1'
              })
     ]
 
@@ -484,7 +490,8 @@
             '/juju-build-trusty-all', '/juju-build-any-all/spb', 'trusty',
             '1.2.3', upatch='1', bugs=['987'], gpgcmd=None,
             debemail='me@email', debfullname='me', verbose=False,
-            date=self.date, build=self.build, revid=self.revid)
+            date=self.date, build=self.build, revid=self.revid,
+            epoch=self.epoch)
         script = BUILD_SOURCE_TEMPLATE.format(
             spb='/juju-build-any-all/spb',
             source='/juju-build-trusty-all/source',
@@ -503,7 +510,8 @@
             '/juju-build-trusty-all', '/juju-build-any-all/spb', 'trusty',
             '1.2.3', upatch='1', bugs=['987'], gpgcmd='/my/gpgcmd',
             debemail='me@email', debfullname='me', verbose=False,
-            date=self.date, build=self.build, revid=self.revid)
+            date=self.date, build=self.build, revid=self.revid,
+            epoch=self.epoch)
         script = BUILD_SOURCE_TEMPLATE.format(
             spb='/juju-build-any-all/spb',
             source='/juju-build-trusty-all/source',
@@ -522,17 +530,20 @@
     scenarios = [
         ('release',
             {'date': None,
+             'epoch': None,
              'build': None,
              'revid': None
              }),
 
         ('daily',
             {'date': '20160502',
+             'epoch': '1',
              'build': '3065',
              'revid': '4bbce805'
              }),
         ('broken_daily',
             {'date': None,
+             'epoch': None,
              'build': '3065',
              'revid': '4bbce805'
              })
@@ -643,10 +654,13 @@
             if self.revid:
                 args_list.append('--revid')
                 args_list.append(self.revid)
+            args_list.append('--epoch')
+            args_list.append(self.epoch)
             code = main(args_list)
         self.assertEqual(0, code)
         bs_mock.assert_called_with(
             'my.tar.gz', '~/workspace', 'trusty', ['123', '456'],
             debemail='me@email', debfullname='me', gpgcmd=None,
             branch=DEFAULT_SPB, upatch='1', verbose=False,
-            date=self.date, build=self.build, revid=self.revid)
+            date=self.date, build=self.build, revid=self.revid,
+            epoch=self.epoch)