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

Fix opensuse provisioning support #1369

Merged
merged 1 commit into from Jan 23, 2020

Conversation

ryg-
Copy link

@ryg- ryg- commented Nov 27, 2019

task/selinux.py, orchestra/remote.py: disable SELinux for opensuse/suse distros
nuke/actions.py: added support for sle/opensuse distros

Signed-off-by: Roman Grigorev rgrigorev@suse.de

@ceph-jenkins
Copy link

Can one of the admins verify this patch?

@kshtsk
Copy link
Contributor

kshtsk commented Nov 27, 2019

ok to test

@kshtsk
Copy link
Contributor

kshtsk commented Nov 27, 2019

@susebot run deploy

@kshtsk kshtsk added test deploy-test teuthology deployment test labels Nov 27, 2019
@susebot
Copy link

susebot commented Nov 27, 2019

Commit b0910b4 is OK.
Check tests results in the Jenkins job: https://ceph-ci.suse.de/job/pr-teuthology-deploy/61/

@ryg-
Copy link
Author

ryg- commented Nov 29, 2019

@susebot run deploy

@susebot
Copy link

susebot commented Nov 29, 2019

Commit b0910b4 is OK.
Check tests results in the Jenkins job: https://ceph-ci.suse.de/job/pr-teuthology-deploy/63/

Copy link
Contributor

@toabctl toabctl left a comment

Choose a reason for hiding this comment

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

Would be nice to have a bit more of a description (in the commit msg) what is broken and why this is needed (see also https://github.com/ceph/ceph/blob/master/SubmittingPatches.rst#id7 )

@ryg- ryg- force-pushed the wip-fix-opensuse-provisioning branch from b0910b4 to d9265e4 Compare December 4, 2019 08:12
@ryg-
Copy link
Author

ryg- commented Dec 4, 2019

Ti be honest

Would be nice to have a bit more of a description (in the commit msg) what is broken and why this is needed (see also https://github.com/ceph/ceph/blob/master/SubmittingPatches.rst#id7 )

commit message is updated

toabctl
toabctl previously approved these changes Dec 4, 2019
@kshtsk
Copy link
Contributor

kshtsk commented Dec 9, 2019

if dist_release in ['opensuse', 'sle']:
remote.run(
args=['sudo', 'zypper', 'clean']
)
Copy link
Contributor

Choose a reason for hiding this comment

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

any reason why remote.run instead of remote.sh ?

Copy link
Contributor

Choose a reason for hiding this comment

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

yeah... looks like copy-paster

Copy link
Author

Choose a reason for hiding this comment

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

should I replace it?

Copy link
Contributor

Choose a reason for hiding this comment

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

This is a new code, why not to make it humanized?

Copy link
Contributor

Choose a reason for hiding this comment

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

Could you please use remote.sh like this:

remote.sh('sudo zippier clean')

Copy link
Author

Choose a reason for hiding this comment

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

done

@kshtsk
Copy link
Contributor

kshtsk commented Dec 9, 2019

suse:tier0 in sepia for this PR http://pulpito.ceph.com/kyr-2019-12-09_19:46:45-suse:tier0-nautilus-none-basic-smithi/

@ryg- the run above has used following file:

$ cat nautilus-overrides.yaml 
overrides:
  install:
    ceph:
      packages:
        deb: []
        rpm: []
    repos:
    - name: nautilus
      url: https://download.opensuse.org/repositories/filesystems:/ceph:/nautilus/openSUSE_Leap_15.1/
    - name: distro
      url: http://download.opensuse.org/distribution/leap/15.1/repo/oss/
    - name: update
      url: http://download.opensuse.org/update/leap/15.1/oss/

And the command:

teuthology-suite -m smithi -k none --ceph-repo https://github.com/ceph/ceph --ceph nautilus \
--suite-repo https://github.com/suse/ceph --suite-branch ses6-downstream-commits \
--filter opensuse --suite suse:tier0 -d opensuse -D 15.1 \
-v $PWD/nautilus-overrides.yaml --newest 100 --limit 1 -t refs/pull/1369/merge

I had to apply the patch from the #1373 to the teuthology in order to successfully schedule the run.

@ryg- ryg- force-pushed the wip-fix-opensuse-provisioning branch 2 times, most recently from a2411f3 to 626a6f3 Compare January 3, 2020 21:22
@kshtsk
Copy link
Contributor

kshtsk commented Jan 10, 2020

@susebot run deploy

@susebot
Copy link

susebot commented Jan 11, 2020

Commit 626a6f3 is NOT OK.
Check tests results in the Jenkins job: https://ceph-ci.suse.de/job/pr-teuthology-deploy/95/

teuthology/task/selinux.py Outdated Show resolved Hide resolved
@ryg- ryg- force-pushed the wip-fix-opensuse-provisioning branch 2 times, most recently from 2ef24c2 to 54509bf Compare January 14, 2020 15:21
@toabctl
Copy link
Contributor

toabctl commented Jan 17, 2020

@ryg- needs a rebase to fix the test failure ERROR: Package 'setuptools' requires a different Python: 2.7.12 not in '>=3.5'

@ryg- ryg- force-pushed the wip-fix-opensuse-provisioning branch from 54509bf to 4f8834e Compare January 17, 2020 13:19
@ryg-
Copy link
Author

ryg- commented Jan 17, 2020

@susebot run deploy

1 similar comment
@toabctl
Copy link
Contributor

toabctl commented Jan 17, 2020

@susebot run deploy

@susebot
Copy link

susebot commented Jan 17, 2020

Commit 4f8834e is NOT OK.
Check tests results in the Jenkins job: https://ceph-ci.suse.de/job/pr-teuthology-deploy/97/

@smithfarm
Copy link
Contributor

Hi @ryg- This doesn't fix the kernel task, though, right? We still have to use --kernel none on opensuse.

elif remote.os.name in ['opensuse', 'sle']:
msg = "Excluding {host}: \
SELinux is not supported for '{os}' os_type yet"
log.info(msg.format(host=remote.shortname))
Copy link
Contributor

Choose a reason for hiding this comment

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

os=remote.os.name missing here, causing test failure:

2020-01-17T20:50:22.461 INFO:teuthology.run_tasks:Running task selinux...
2020-01-17T20:50:22.482 ERROR:teuthology.run_tasks:Saw exception from tasks.
Traceback (most recent call last):
  File "/home/teuthworker/src/git.ceph.com_git_teuthology_wip-fix-opensuse-provisioning/teuthology/run_tasks.py", line 86, in run_tasks
    manager = run_one_task(taskname, ctx=ctx, config=config)
  File "/home/teuthworker/src/git.ceph.com_git_teuthology_wip-fix-opensuse-provisioning/teuthology/run_tasks.py", line 65, in run_one_task
    return task(**kwargs)
  File "/home/teuthworker/src/git.ceph.com_git_teuthology_wip-fix-opensuse-provisioning/teuthology/task/selinux.py", line 42, in __init__
    super(SELinux, self).__init__(ctx, config)
  File "/home/teuthworker/src/git.ceph.com_git_teuthology_wip-fix-opensuse-provisioning/teuthology/task/__init__.py", line 36, in __init__
    self.filter_hosts()
  File "/home/teuthworker/src/git.ceph.com_git_teuthology_wip-fix-opensuse-provisioning/teuthology/task/selinux.py", line 59, in filter_hosts
    log.info(msg.format(host=remote.shortname))
KeyError: 'os'

Copy link
Contributor

@smithfarm smithfarm left a comment

Choose a reason for hiding this comment

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

I am able to test this PR in the Sepia lab now. It's currently failing with KeyError: 'os' in the selinux task for the reason noted.

@ryg- ryg- force-pushed the wip-fix-opensuse-provisioning branch from 66dda9a to b31a085 Compare January 17, 2020 21:36
task/selinux.py, orchestra/remote.py:
    disable SELinux for opensuse/suse distros

nuke/actions.py:
    added support for sle/opensuse distros

Signed-off-by: Roman Grigorev <rgrigorev@suse.de>
Copy link
Contributor

@smithfarm smithfarm left a comment

Choose a reason for hiding this comment

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

Yay, with this and -k none I get through provisioning phase! It still fails in the install task but that can be fixed in a follow-up PR.

@smithfarm
Copy link
Contributor

@susebot run deploy

@susebot
Copy link

susebot commented Jan 17, 2020

Commit b31a085 is NOT OK.
Check tests results in the Jenkins job: https://ceph-ci.suse.de/job/pr-teuthology-deploy/98/

@kshtsk
Copy link
Contributor

kshtsk commented Jan 22, 2020

@susebot run deploy

@ryg-
Copy link
Author

ryg- commented Jan 22, 2020

@kshtsk
Copy link
Contributor

kshtsk commented Jan 22, 2020

@susebot run deploy

@ceph ceph deleted a comment from susebot Jan 22, 2020
@ceph ceph deleted a comment from susebot Jan 22, 2020
@susebot
Copy link

susebot commented Jan 22, 2020

Commit b31a085 is OK.
Check tests results in the Jenkins job: https://ceph-ci.suse.de/job/pr-teuthology-deploy/102/

@kshtsk kshtsk merged commit cae3b6e into ceph:master Jan 23, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
deploy-test teuthology deployment test test
Projects
None yet
6 participants