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

update churn #238

Merged
merged 7 commits into from
Apr 25, 2022
Merged

update churn #238

merged 7 commits into from
Apr 25, 2022

Conversation

goern
Copy link
Member

@goern goern commented Mar 22, 2022

  • address several RHBA in ubi8 python38 container image, update python dependencies
  • address several RHBA in ubi8 python39 container image, update python dependencies
  • address several RHBA in ubi8 python36 container image, update python dependencies
  • python dependencies for f34 and f35

@sesheta
Copy link
Member

sesheta commented Mar 22, 2022

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
To complete the pull request process, please ask for approval from goern after the PR has been reviewed.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@sesheta sesheta added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Mar 22, 2022
@goern
Copy link
Member Author

goern commented Mar 22, 2022

/assign @Gregory-Pereira
/assign @harshad16

@mayaCostantini
Copy link
Contributor

/lgtm
The new version of Thamos has been released so I think it should be good to go.

@sesheta sesheta added the lgtm Indicates that a PR is ready to be merged. label Mar 24, 2022
f34-py39/requirements.txt Outdated Show resolved Hide resolved
f35-py310/requirements.txt Outdated Show resolved Hide resolved
ubi8-py38/requirements.txt Outdated Show resolved Hide resolved
ubi8-py39/requirements.txt Outdated Show resolved Hide resolved
@Gregory-Pereira
Copy link
Member

Gregory-Pereira commented Mar 24, 2022

I tested each overlay from your forked branch, not sure if I am building them wrong but they don't have access to the thamos cli, not sure if it is needed...

$ podman build -f f34-py39/Dockerfile -t f34-py39;
$ podman build -f f35-py310/Dockerfile -t f35-py310;
$ podman build -f ubi8-py38/Dockerfile -t ubi8-py38;
$ podman build -f ubi8-py39/Dockerfile -t ubi8-py39;
$ podman build -f ubi8-py36/Dockerfile -t ubi8-py36;
 
$ podman run --rm -it <each image tag> bash
(app-root) which thamos
bash: thamos: command not found
(app-root) pip list
Package    Version
---------- -------
pip        21.0.1
setuptools 39.2.0
wheel      0.31.1

@sesheta sesheta removed the lgtm Indicates that a PR is ready to be merged. label Mar 29, 2022
@sesheta
Copy link
Member

sesheta commented Mar 29, 2022

New changes are detected. LGTM label has been removed.

1 similar comment
@sesheta
Copy link
Member

sesheta commented Mar 29, 2022

New changes are detected. LGTM label has been removed.

@Gregory-Pereira
Copy link
Member

The f34-py39 overlay is looking for pip3 binary at path /usr/pin/pip3. Either use its current path /opt/app-root/bin/pip3 or copy it to /usr/bin. This entails modifying these two lines in your fork. This also causes build to fail, but after this change and the thamos hash, it builds successfully.

@Gregory-Pereira
Copy link
Member

Gregory-Pereira commented Apr 1, 2022

Same changes apply to the f35-py310 overlay as the f34-py39 overlay.
1. change these lines to use /opt/app-root/bin/pip3 instead of /usr/bin/pip3.
2. change these lines to use the correct hashes:

    --hash=sha256:8def2131b43f0a6fb157f80dfb277ebfce387155ffb7e3da86b12ba5eef2be44 \
    --hash=sha256:d5d69c900b8ca90ff2feb9b89d358abddfbfb2c580359966206b93253a3019a2

After these changes the f35-py310 overlay builds successfully.

@Gregory-Pereira
Copy link
Member

Same changes apply to the ubi8-py38 overlay as the f34-py39 overlay.
1. change these lines to use /opt/app-root/bin/pip3 instead of /usr/bin/pip3.
2. change these lines to use the correct hashes:

    --hash=sha256:8def2131b43f0a6fb157f80dfb277ebfce387155ffb7e3da86b12ba5eef2be44 \
    --hash=sha256:d5d69c900b8ca90ff2feb9b89d358abddfbfb2c580359966206b93253a3019a2

After these changes the ubi8-py38 overlay builds successfully.

@Gregory-Pereira
Copy link
Member

Same changes apply to the ubi8-py39 overlay as the f34-py39 overlay.
1. change these lines to use /opt/app-root/bin/pip3 instead of /usr/bin/pip3.
2. change these lines to use the correct hashes:

    --hash=sha256:8def2131b43f0a6fb157f80dfb277ebfce387155ffb7e3da86b12ba5eef2be44 \
    --hash=sha256:d5d69c900b8ca90ff2feb9b89d358abddfbfb2c580359966206b93253a3019a2

After these changes the ubi8-py39 overlay builds successfully.

@Gregory-Pereira
Copy link
Member

The changes for the ubi8-py36 overlay are similar but not exactly the same. You should change these lines to use /opt/app-root/bin/pip3 instead of /usr/bin/pip3 as with the over overlays.

However, The difference is that the thamos version is set to 1.27.3 instead of 1.27.4. If this difference in the thamos version is intentional skip this step, but if not, additionally alter the hashes for the thamos version by changing these lines to use the correct hashes:

    --hash=sha256:8def2131b43f0a6fb157f80dfb277ebfce387155ffb7e3da86b12ba5eef2be44 \
    --hash=sha256:d5d69c900b8ca90ff2feb9b89d358abddfbfb2c580359966206b93253a3019a2

Either way, after these changes the ubi8-py36 overlay builds successfully.

@goern
Copy link
Member Author

goern commented Apr 4, 2022

@Gregory-Pereira thanks for the deep look at it!! 💯
actually, you could contribute these changes to my pr

…dependencies

Signed-off-by: Christoph Görn <goern@redhat.com>
goern and others added 6 commits April 25, 2022 14:06
…dependencies

Signed-off-by: Christoph Görn <goern@redhat.com>
…dependencies

Signed-off-by: Christoph Görn <goern@redhat.com>
Signed-off-by: Christoph Görn <goern@redhat.com>
Signed-off-by: Christoph Görn <goern@redhat.com>
Co-authored-by: Maya Costantini <66788861+mayaCostantini@users.noreply.github.com>
Signed-off-by: Harshad Reddy Nalla <hnalla@redhat.com>
@harshad16
Copy link
Member

Thanks, everyone for your contributions and reviews

@harshad16 harshad16 merged commit dfadc7a into thoth-station:master Apr 25, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants