Skip to content

ART-21309: remove Dockerfile/shell parsing, leverage rpm-lockfile-prototype 0.30.0 #3191

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.

Sign up for GitHub

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

Open
fgallott wants to merge 1 commit into
base: main
Choose a base branch
from
+1,041 −5,028
Open

ART-21309: remove Dockerfile/shell parsing, leverage rpm-lockfile-prototype 0.30.0 #3191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion art-cluster/pipelines/config/argocd/project/art-cd/common/image/rpm_lockfile_build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ spec:
output:
to:
kind: ImageStreamTag
name: rpm-lockfile-prototype:v0.25.0
name: rpm-lockfile-prototype:v0.30.0
successfulBuildsHistoryLimit: 10
failedBuildsHistoryLimit: 5
runPolicy: Serial
2 changes: 1 addition & 1 deletion art-cluster/pipelines/data/project/art-cd/image/Containerfile.rpm_lockfile_prototype
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ RUN curl --silent --show-error --fail --insecure --output /etc/pki/ca-trust/sour

WORKDIR /app

ARG GIT_REF=tags/v0.25.0
ARG GIT_REF=tags/v0.30.0

RUN python3 -m pip install https://github.com/konflux-ci/rpm-lockfile-prototype/archive/refs/${GIT_REF}.tar.gz

Expand Down
10 changes: 0 additions & 10 deletions doozer/doozerlib/lockfile_prototype/constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,11 @@
SYSTEM_PYTHON = "/usr/bin/python3"
RPM_LOCKFILE_ENTRY_POINT = "from rpm_lockfile import main; main()"

# Shell subshell expressions that evaluate to the current architecture
ARCH_SUBSHELL_KEYWORDS = ("$(arch)", "$(uname -m)", "$(uname -p)", "$(go env GOARCH)")

# Shell variable names that hold the current architecture
ARCH_VAR_NAMES = ("HOSTTYPE", "ARCH", "GOARCH")

# All arch keywords: subshells + variables in both $VAR and ${VAR} forms
ARCH_KEYWORDS = ARCH_SUBSHELL_KEYWORDS + tuple(form for name in ARCH_VAR_NAMES for form in (f"${name}", f"${{{name}}}"))

# RPM pseudo-packages that appear in rpmdb but are not installable via DNF
RPM_PSEUDO_PACKAGES = frozenset({"gpg-pubkey"})

VALID_PKG_NAME = re.compile(r"^[a-zA-Z0-9*][a-zA-Z0-9._+\-*]*$")


# rpm-lockfile-prototype stores extracted RPMDBs under
# $XDG_CACHE_HOME/rpm-lockfile-prototype/rpmdbs (defaulting to ~/.cache).
# We set XDG_CACHE_HOME in the subprocess env (see resolver.py) so that
Expand Down
Loading
Loading