generate-tools ignores 2.x agents and creates bad path

[Curtis Hovey]

Since this bug was reported, the generate-tools behaviour is almost correct. The remaining problem is that the --streams option does not work exactly as --help states, and when something is wrong, juju silently goes to streams.canonical.com instead explaining that agents were not found and exiting with an error. When juju falls back to streams.canonical.com, it does not download agents. the streams are useless.

Fix this bug by making juju exit with an error if the expected dir is missing or there are no agents in the dir.

"""
Tools tarballs can are located in either a sub directory called "releases" (legacy),
or a directory named after the stream. By default, if no --stream argument is provided,
metadata for tools in the "released" stream is generated by scanning for tool tarballs
in the "releases" directory.
"""

Juju 2 doesn't really have "releases" like juju 1 did. For extra credit, make "released" the default dir since it is the default agent-streams so that there is a one-to-one relationship between the location of the agents and the selected agent-streams so that juju just works.

[Nate Finch (natefinch)]

I can't reproduce this. It seems to work fine for me:

└── mystreams
    └── tools
        ├── devel
        │   ├── fix-ppc.tgz
        │   ├── juju-1.25.5.1-trusty-ppc64el.tgz
        │   ├── juju-1.25.5.2-trusty-ppc64el.tgz
        │   └── juju-2.0.0-xenial-amd64.tgz
        └── streams
            └── v1
                ├── com.ubuntu.juju-devel-tools.json
                └── index2.json

$ more mystreams/tools/streams/v1/com.ubuntu.juju-devel-tools.json
{
    "products": {
        "com.ubuntu.juju:14.04:ppc64": {
            "version": "1.25.5.1",
            "arch": "ppc64",
            "versions": {
                "20161012": {
                    "items": {
                        "1.25.5.1-trusty-ppc64": {
                            "release": "trusty",
                            "version": "1.25.5.1",
                            "arch": "ppc64",
                            "size": 13645904,
                            "path": "devel/juju-1.25.5.1-trusty-ppc64el.tgz",
                            "ftype": "tar.gz",
                            "sha256": "d72791058bf598da365a2b5257ca6c953392edf6d94247308bd671497cb7e094"
                        },
                        "1.25.5.2-trusty-ppc64": {
                            "release": "trusty",
                            "version": "1.25.5.2",
                            "arch": "ppc64",
                            "size": 13645904,
                            "path": "devel/juju-1.25.5.2-trusty-ppc64el.tgz",
                            "ftype": "tar.gz",
                            "sha256": "9ef3bbfce3234752e9f20c78954a0592b38d30764e98281845166265a26873c4"
                        }
                    }
                }
            }
        },
        "com.ubuntu.juju:14.04:ppc64el": {
            "version": "1.25.5.1",
            "arch": "ppc64el",
            "versions": {
                "20161012": {
                    "items": {
                        "1.25.5.1-trusty-ppc64el": {
                            "release": "trusty",
                            "version": "1.25.5.1",
                            "arch": "ppc64el",
                            "size": 13645904,
                            "path": "devel/juju-1.25.5.1-trusty-ppc64el.tgz",
                            "ftype": "tar.gz",
                            "sha256": "d72791058bf598da365a2b5257ca6c953392edf6d94247308bd671497cb7e094"
                        },
                        "1.25.5.2-trusty-ppc64el": {
                            "release": "trusty",
                            "version": "1.25.5.2",
                            "arch": "ppc64el",
                            "size": 13645904,
                            "path": "devel/juju-1.25.5.2-trusty-ppc64el.tgz",
                            "ftype": "tar.gz",
                            "sha256": "9ef3bbfce3234752e9f20c78954a0592b38d30764e98281845166265a26873c4"
                        }
                    }
                }
            }
        },
        "com.ubuntu.juju:16.04:amd64": {
            "version": "2.0.0",
            "arch": "amd64",
            "versions": {
                "20161012": {
                    "items": {
     ...

[Nate Finch (natefinch)]

go get github.com/axw/juju-tools
# this is a plugin to juju ^
# it uses juju, so make sure juju is building on master
juju tools build
# ^ this makes a tools .tgz in your local dir
mkdir -p mystreams/tools/devel
cp *.tgz to mystreams/tools/devel

juju metadata generate-tools -d mystreams --stream devel

#upload to s3

juju bootstrap --config=agent-metadata-url=s3urlhere

[Katherine Cox-Buday (cox-katherine-e)]

PR here: https://github.com/juju/juju/pull/6441