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(is_enterprise): check command output applying logic #6957

Merged
merged 1 commit into from
Dec 20, 2023

Conversation

fruch
Copy link
Contributor

@fruch fruch commented Dec 17, 2023

since in cases we might have failure like the following:

Could not retrieve mirrorlist http://mirrorlist.centos.org/?release=7&arch=x86_64
    &repo=os&infra=stock error was

14: curl#7 - "Failed connect to mirrorlist.centos.org:80; Operation now in progress"

we wrong assumed this should be enterpise and tried to install enterpise artifacts (which didn't existed)

PR pre-checks (self review)

  • I followed KISS principle and best practices
  • I didn't leave commented-out/debugging code
  • I added the relevant backport labels
  • New configuration option are added and documented (in sdcm/sct_config.py)
  • I have added tests to cover my changes (Infrastructure only - under unit-test/ folder)
  • All new and existing unit tests passed (CI)
  • I have updated the Readme/doc folder accordingly (if needed)

since in cases we might have failure like the following:

```
Could not retrieve mirrorlist http://mirrorlist.centos.org/?release=7&arch=x86_64
    &repo=os&infra=stock error was

14: curl#7 - "Failed connect to mirrorlist.centos.org:80; Operation now in progress"
```

we wrong assumed this should be enterpise and tried to install
enterpise artifacts (which didn't existed)
@fruch fruch added the test-provision-aws Run provision test on AWS label Dec 17, 2023
@fruch fruch marked this pull request as ready for review December 18, 2023 11:18
return "scylla-enterprise.x86_64" in result or "No matches found" not in result
result = self.remoter.sudo("yum search scylla-enterprise 2>&1", ignore_status=True)
if result.ok:
_is_enterprise = "scylla-enterprise.x86_64" in result.stdout or "No matches found" not in result.stdout
Copy link
Contributor

Choose a reason for hiding this comment

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

What about enterprise on Arm?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I guess the other logic would cover it (i.e. No matches)

I just moved it around, the already available logic.

Copy link
Contributor

@soyacz soyacz left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

@vponomaryov vponomaryov left a comment

Choose a reason for hiding this comment

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

LGTM

@fruch fruch merged commit b9dde0e into scylladb:master Dec 20, 2023
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
test-provision-aws Run provision test on AWS
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants