Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Get dummy suite to run on openSUSE Leap in OpenStack #858

Merged
merged 3 commits into from Aug 29, 2016

Conversation

smithfarm
Copy link
Contributor

dummy suite runs to successful completion in OVH when these patches are applied to https://github.com/dachary/teuthology/tree/openstack

@smithfarm smithfarm force-pushed the wip-openstack-opensuse branch 2 times, most recently from 6d41e1b to c8d0ac1 Compare May 12, 2016 11:56
@smithfarm
Copy link
Contributor Author

@dachary @zmc

@ghost
Copy link

ghost commented May 12, 2016

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

@ghost
Copy link

ghost commented May 12, 2016

@zmc I verified it works by looking at a dummy suite run @smithfarm gave me (the cluster is gone now but I saw it with my own eyes ;-)

@smithfarm
Copy link
Contributor Author

test this please

1 similar comment
@zmc
Copy link
Member

zmc commented May 13, 2016

test this please

@smithfarm
Copy link
Contributor Author

==================================== ERRORS ====================================
_________ ERROR collecting teuthology/openstack/test/test_openstack.py _________
.tox/openstack/local/lib/python2.7/site-packages/_pytest/python.py:611: in _importtestmodule
    mod = self.fspath.pyimport(ensuresyspath=importmode)
.tox/openstack/local/lib/python2.7/site-packages/py/_path/local.py:650: in pyimport
    __import__(modname)
E     File "/home/jenkins-build/build/workspace/teuthology-pull-requests/teuthology/openstack/__init__.py", line 197
E       'ubuntu-12.04': 'https://cloud-images.ubuntu.com/precise/current/precise-server-cloudimg-amd64-disk1.img',
E                     ^
E   SyntaxError: invalid syntax
================== 1 pytest-warnings, 1 error in 0.17 seconds ==================

@@ -193,6 +193,7 @@ class OpenStack(object):
'centos-7.0': 'http://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-1503.qcow2',
'centos-7.1': 'http://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-1503.qcow2',
'centos-7.2': 'http://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-1511.qcow2',
'opensuse-42.1': 'http://download.opensuse.org/repositories/Cloud:/Images:/Leap_42.1/images/openSUSE-Leap-42.1-OpenStack.x86_64.qcow2'
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comma missing at the end of this line - this commit was cherry-picked from a different branch and syntax error was introduced during conflict resolution.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lesson learned - need to do python -m py_compile on files after conflict resolution.

@smithfarm smithfarm force-pushed the wip-openstack-opensuse branch 2 times, most recently from 4d51df9 to aeed89f Compare May 14, 2016 00:06
@smithfarm
Copy link
Contributor Author

Changelog:

  • fix syntax error introduced during conflict resolution
  • s/OpenSuse/openSUSE/ in commit message
  • added Signed-off-by: Loic to the commit co-written with Loic

@smithfarm
Copy link
Contributor Author

@zmc Any tests you want me to run?

@smithfarm
Copy link
Contributor Author

Ping?

@zmc
Copy link
Member

zmc commented Jun 2, 2016

Apologies, @smithfarm! I hadn't seen your ping.

What's the reason for munging the name in opsys.os? The rest of your PR references 'opensuse' but in that module you're specifically dropping that and calling it 'suse'. I first noticed this in OS.from_os_release(), where I don't think we ought to be special-casing things.

@smithfarm
Copy link
Contributor Author

@zmc I don't remember exactly, but I think I munged it to be compatible with https://github.com/ceph/teuthology/blob/master/teuthology/orchestra/opsys.py#L52

I think not munging is better, because openSUSE and SLE are distinct entities. (For now I am targeting openSUSE only.)

I will push a new version of this wip branch that uses "opensuse" everywhere. Thanks!

ldachary and others added 3 commits June 20, 2016 16:50
Signed-off-by: Loic Dachary <ldachary@redhat.com>
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Add rsyslog to the packages list

Signed-off-by: Nathan Cutler <ncutler@suse.com>
Signed-off-by: Nathan Cutler <ncutler@suse.com>
@smithfarm
Copy link
Contributor Author

@zmc Does this address your concerns?

@smithfarm
Copy link
Contributor Author

@zmc Can this be merged? @rjfd has more changes that were made on top of these.

@zmc
Copy link
Member

zmc commented Aug 29, 2016

Yes, this looks good! Sorry for the delay :)

@zmc zmc merged commit 9da30bb into ceph:master Aug 29, 2016
@smithfarm smithfarm deleted the wip-openstack-opensuse branch September 16, 2016 15:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants