Commit f3b1ceb975609111564f3c7735cf1f49bcc21ad9

Authored by Nathan Cutler
2 parents 11e30321 da8af128

Merge branch 'wip-repo' into 'master'

switch to --{ceph,suite}-repo

--ceph-git-url and --ceph-qa-suite-git-url are now
arguments of teuthology-suite but were named --ceph-repo and
--suite-repo instead.

Signed-off-by: Loic Dachary <ldachary@redhat.com>

See merge request !54
... ... @@ -235,7 +235,7 @@ class CephWorkbench(object):
235 235 description=textwrap.dedent("""\
236 236 Create packages and repositories for a Ceph version
237 237
238   - . Clone the --ceph-git-url repository
  238 + . Clone the --ceph-repo repository
239 239 . Tag the tip of the --ceph branch with --version if
240 240 the tag does not exist yet
241 241 . Build the packages for the tag with:
... ... @@ -294,7 +294,7 @@ class CephWorkbench(object):
294 294 also installs them once as a sanity check.
295 295
296 296 ceph-workbench release --suite buildpackages/any \\
297   - --ceph-git-url http://github.com/dachary/ceph \\
  297 + --ceph-repo http://github.com/dachary/ceph \\
298 298 --ceph jewel \\
299 299 --version 10.0.4 \\
300 300 --filter ubuntu_14.04,centos_7.2
... ...
... ... @@ -213,13 +213,13 @@ class CephRelease(TeuthologyDelegate):
213 213 fi
214 214 git update-server-info
215 215 """.format(branch=self.args.ceph,
216   - git_url=self.args.ceph_git_url,
  216 + git_url=self.args.ceph_repo,
217 217 tag=tag))
218 218
219 219 def build_phase(self):
220 220 tag = 'v' + self.args.version
221 221 ip = OpenStackInstance(self.args.name).get_floating_ip_or_ip()
222   - self.args.ceph_git_url = 'http://' + ip + '/ceph'
  222 + self.args.ceph_repo = 'http://' + ip + '/ceph'
223 223 self.args.ceph = tag
224 224 argv = self.get_trimmed_argv(openstack.get_parser(), self.args)
225 225 command = ("teuthology-openstack " +
... ...
... ... @@ -25,7 +25,7 @@
25 25 # bash -x tests/setup-ceph-fixture.sh tests/ceph-fixture /usr/share/nginx/html/ceph-fixture # noqa
26 26 #
27 27 # git fetch ; git reset --hard origin/wip-release
28   -# PYTHONPATH=teuthology ceph-workbench '--verbose' release '--version' '10.1.0' '--key-name' 'teuthology-test' --key-filename ~/.ceph-workbench/teuthology-test.pem --ceph-workbench-branch wip-release --ceph-workbench-git-url http://ceph-workbench.dachary.org/dachary/ceph-workbench.git '--suite' 'buildpackages/tests' '--ceph-qa-suite-git-url' 'http://github.com/dachary/ceph-qa-suite' '--suite-branch' 'wip-buildpackages' '--ceph-git-url' 'http://167.114.249.129/ceph-fixture' '--filter' 'ubuntu_14.04,centos_7.0' # noqa
  28 +# PYTHONPATH=teuthology ceph-workbench '--verbose' release '--version' '10.1.0' '--key-name' 'teuthology-test' --key-filename ~/.ceph-workbench/teuthology-test.pem --ceph-workbench-branch wip-release --ceph-workbench-git-url http://ceph-workbench.dachary.org/dachary/ceph-workbench.git '--suite' 'buildpackages/tests' '--suite-repo' 'http://github.com/dachary/ceph-qa-suite' '--suite-branch' 'wip-buildpackages' '--ceph-repo' 'http://167.114.249.129/ceph-fixture' '--filter' 'ubuntu_14.04,centos_7.0' # noqa
29 29 #
30 30 # On the teuthology cluster, try the build phase with:
31 31 #
... ... @@ -33,7 +33,7 @@
33 33 # git fetch ; git reset --hard origin/wip-release
34 34 # ip=$(hostname -I | cut -f1 -d' ')
35 35 # bash -x tests/setup-ceph-fixture.sh tests/ceph-fixture /usr/share/nginx/html/ceph-fixture # noqa
36   -# ceph-workbench --verbose release --tag-phase --build-phase --release-phase --wait --ceph-git-url http://$ip/ceph-fixture --ceph-qa-suite-git-url http://github.com/dachary/ceph-qa-suite --key-filename /home/ubuntu/.ceph-workbench/teuthology.pem --key-name teuthology -s buildpackages/tests --suite-branch wip-buildpackages -v --version 10.1.0 --filter centos_7.2 # noqa
  36 +# ceph-workbench --verbose release --tag-phase --build-phase --release-phase --wait --ceph-repo http://$ip/ceph-fixture --suite-repo http://github.com/dachary/ceph-qa-suite --key-filename /home/ubuntu/.ceph-workbench/teuthology.pem --key-name teuthology -s buildpackages/tests --suite-branch wip-buildpackages -v --version 10.1.0 --filter centos_7.2 # noqa
37 37 #
38 38 #
39 39 # Test builds etc. but do not cleanup afterwards for debug & analysis
... ... @@ -204,10 +204,10 @@ class TestCephRelease(object):
204 204 # Keep these around for when a ceph-qa-suite branch is
205 205 # needed for tests.
206 206 #
207   - # '--ceph-qa-suite-git-url',
  207 + # '--suite-repo',
208 208 # 'http://github.com/dachary/ceph-qa-suite',
209 209 # '--suite-branch', 'wip-buildpackages',
210   - '--ceph-git-url', 'http://' + ip + '/ceph-fixture',
  210 + '--ceph-repo', 'http://' + ip + '/ceph-fixture',
211 211 '--name', 'teuthology-test',
212 212 '--filter', 'ubuntu_14.04.yaml,centos_7.2.yaml',
213 213 ])
... ...
Please register or login to post a comment