Skip to content

Fix advisory inheritance and overrides - #148

Open
adobes1 wants to merge 1 commit into
openshift-eng:masterfrom
adobes1:fix-advisory-overrides
Open

Fix advisory inheritance and overrides#148
adobes1 wants to merge 1 commit into
openshift-eng:masterfrom
adobes1:fix-advisory-overrides

Conversation

@adobes1

@adobes1 adobes1 commented Sep 20, 2024

Copy link
Copy Markdown
Contributor

Fixes the following:

  1. Previously, when retrieving advisory IDs of a release which had advisories! defined, art-dash would use the advisories defined in the basis version (it would also not retrieve the corresponding jira ticket)
  2. When merging current_advisories and basis_advisories (or basis_override_advisories), art-dash would layer basis_advisories (or basis_override_advisories) over current_advisories. Now it is the opposite.

Also temporarily replace ./install.sh in the Dockerfiles with pip3 install -e artcommon/ -e doozer/ -e elliott/ -e pyartcd/ because ./install.sh is now using uv package manager and so far I couldn't get it to work inside the Dockerfiles. This is now fixed

@openshift-ci

openshift-ci Bot commented Sep 20, 2024

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign ashwindasr for approval. For more information see the Kubernetes Code Review Process.

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

Details 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

@joepvd

joepvd commented Sep 20, 2024

Copy link
Copy Markdown
Contributor

Let's try and get uv installation to work :)

/hold

@openshift-ci openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 20, 2024
@adobes1
adobes1 force-pushed the fix-advisory-overrides branch from 7e9c594 to 836eabb Compare October 7, 2024 12:39
@adobes1

adobes1 commented Oct 7, 2024

Copy link
Copy Markdown
Contributor Author

I switched back to using install.sh in the Dockerfiles, uv virtual environment should now correctly.

@ashwindasr ashwindasr left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Did you try this?

Comment thread Dockerfile.base
Comment on lines +63 to +66

#Setup uv package manager
RUN curl -LsSf https://astral.sh/uv/install.sh | env UV_INSTALL_DIR="/home/$USERNAME/.local" sh \
&& uv venv --python 3.11 ../.venv

@ashwindasr ashwindasr Oct 7, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
#Setup uv package manager
RUN curl -LsSf https://astral.sh/uv/install.sh | env UV_INSTALL_DIR="/home/$USERNAME/.local" sh \
&& uv venv --python 3.11 ../.venv
# Setup uv package manager
RUN pip3 install uv && uv venv --python 3.11

@adobes1 adobes1 Oct 8, 2024

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

When installing uv with pip, uv self update is disabled and it has to be updated with pip. I wanted to avoid having to update pip just so we can us it to update uv but not really sure if my thinking there is correct. What do you think?

As for installing the virtual environment in workspaces/.venv instead of workspaces/art-dash/.venv - I did it this way because in the art-dashboard-server README, the recommended podman run ... command also includes
-v "$OPENSHIFT/art-dashboard-server":/workspaces/art-dash:cached which causes the users art-dashboard-server to be mounted over our workspaces/art-dash/ - and with it, the .venv we setup while building the container as well (it wouldn't be accessible)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Updating inside a container is not so much of a concern. Just rebuild the image and get the newest.

@openshift-ci openshift-ci Bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 18, 2026
@openshift-ci

openshift-ci Bot commented Mar 18, 2026

Copy link
Copy Markdown
Contributor

PR needs rebase.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants