sclorg / container-common-scripts

Apache License 2.0
20 stars 45 forks source link

Calculate available cores from cpu cgroups controller #237

Closed yrro closed 2 years ago

yrro commented 2 years ago

Fixes: https://github.com/sclorg/s2i-base-container/issues/180

frenzymadness commented 2 years ago

I guess from the comments in the original PR that this is ready to be merged. What do you say, @phracek ?

phracek commented 2 years ago

[test]

phracek commented 2 years ago

Sanity tests are failing for this reason:

pre-commit run --all
Warning:  Unexpected key(s) present on https://github.com/ambv/black: language_version
[INFO] Initializing environment for https://github.com/ambv/black.
[INFO] Initializing environment for https://github.com/pre-commit/pre-commit-hooks.
[INFO] Initializing environment for https://github.com/pre-commit/mirrors-mypy.
[INFO] Installing environment for https://github.com/ambv/black.
[INFO] Once installed this environment will be reused.
[INFO] This may take a few minutes...
[INFO] Installing environment for https://github.com/pre-commit/pre-commit-hooks.
[INFO] Once installed this environment will be reused.
[INFO] This may take a few minutes...
[INFO] Installing environment for https://github.com/pre-commit/mirrors-mypy.
[INFO] Once installed this environment will be reused.
[INFO] This may take a few minutes...
black....................................................................Failed
- hook id: black
- exit code: 1
Traceback (most recent call last):
  File "/home/runner/.cache/pre-commit/repoospg5i6_/py_env-python3/bin/black", line 8, in <module>
    sys.exit(patched_main())
  File "/home/runner/.cache/pre-commit/repoospg5i6_/py_env-python3/lib/python3.8/site-packages/black.py", line 3753, in patched_main
    patch_click()
  File "/home/runner/.cache/pre-commit/repoospg5i6_/py_env-python3/lib/python3.8/site-packages/black.py", line 3742, in patch_click
    from click import _unicodefun  # type: ignore
ImportError: cannot import name '_unicodefun' from 'click' (/home/runner/.cache/pre-commit/repoospg5i6_/py_env-python3/lib/python3.8/site-packages/click/__init__.py)

Can you please fix it? Just call these three commands:

$ pip3 install pre-commit
$ pre-commit install
$ pre-commit run --all
frenzymadness commented 2 years ago

The problem seems to be in pre-commit, let me take a look.

frenzymadness commented 2 years ago

The problem is described here. What we can do to fix it is to simply upgrade black in pre-commit config file to the latest version 22.6.0 and remove the line with additional dependencies, because:

frenzymadness commented 2 years ago

@yrro could you please update the pre-commit or should I handle it?

phracek commented 2 years ago

The problem is described here. What we can do to fix it is to simply upgrade black in pre-commit config file to the latest version 22.6.0 and remove the line with additional dependencies, because:

* black depends on click, there is no need for having it as an additional dependency, and

* the combination of black 22.1.0 and click 8.0.4 we currently have in the config file should work but it does not and newer click is installed so it seems that the additional dependencies don't work as intended.

I prefer to use the latest and remove the dependency.

phracek commented 2 years ago

RHEL-9 tests are failing because of the subscription manager. It is fixed by https://github.com/sclorg/container-common-scripts/pull/271

frenzymadness commented 2 years ago

[test]

phracek commented 2 years ago

PR https://github.com/sclorg/container-common-scripts/pull/271 is merged let's trigger tests again.

[test]

phracek commented 2 years ago

The tests are failing because the PR has to be rebased against master.

 # FATAL: Please rebase the commit '07c0b26' to allow --ff merge into 'origin/master' branch
make: *** [test] Error 1
yrro commented 2 years ago

Sorry, didn't see that new commit. I guess the tests should pass now since it's rebased onto the fix for the subscription-manager problem now.

phracek commented 2 years ago

[test]

phracek commented 2 years ago

RHEL9 failures are fixed by https://github.com/sclorg/container-common-scripts/pull/272

yrro commented 2 years ago

Thanks, will rebase once that's merged

phracek commented 2 years ago

@yrro The PR https://github.com/sclorg/container-common-scripts/pull/272 has been merged. Please rebased this PR on top of this.

yrro commented 2 years ago

Thanks - rebased

phracek commented 2 years ago

[test]

phracek commented 2 years ago

Fedora test has failed on pino client:

14:23:37                 out:  [PASSED] for 'clients' express
14:23:37                 out:  [FAILED] for 'clients' pino
14:23:37                 out:  [PASSED] for 'clients' prom-client
14:23:37                 out:  [PASSED] for 'clients' opossum
yrro commented 2 years ago

Thanks!