Skip to content

Commit

Permalink
Merge pull request #701 from SUSE/wip-dont-use-ceph-salt-executor
Browse files Browse the repository at this point in the history
Jenkinsfile.integration: use `sesdev create --salt`
  • Loading branch information
tserong authored Jun 22, 2023
2 parents 9d69cac + ded1bde commit 36553b0
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion Jenkinsfile.integration
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def cloud_params = [
]

def sesdev_create_cmd(ceph_salt_git_repo, ceph_salt_git_branch, extra_repo_urls) {
cmd = "sesdev create pacific --non-interactive"
cmd = "sesdev create pacific --salt --non-interactive"
if (!ceph_salt_git_repo.isEmpty()) {
if (ceph_salt_git_branch.isEmpty()) {
error('ceph-salt git repo set, but no ceph-salt git branch given')
Expand Down Expand Up @@ -251,6 +251,8 @@ pipeline {
sesdev scp -r mini master:/var/log/ceph artifacts/ || true
sesdev scp -r mini master:/var/log/salt artifacts/ || true
sesdev scp mini master:/var/log/ceph-salt.log artifacts/ || true
sesdev ssh mini master -- ps auxww --forest > artifacts/ps || true
sesdev ssh mini master journalctl > artifacts/journalctl || true
"""
archiveArtifacts artifacts: 'artifacts/**/*', allowEmptyArchive: true
Expand Down

0 comments on commit 36553b0

Please sign in to comment.