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.

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

Fix CI failures #4675

Merged
merged 1 commit into from
Feb 21, 2024
Merged

Fix CI failures #4675

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
27 changes: 17 additions & 10 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,7 @@ jobs:
print('BASE_IMAGE: {value}'.format(value=value))
print('##vso[task.setvariable variable=BASE_IMAGE]{value}'.format(value=value))

value = os.getenv('REGISTRY_NAMESPACE')

if not value:
value = os.getenv('REPOSITORY_URI')
print('REPOSITORY_URI: {value}'.format(value=value))

# get repository owner
value = re.sub(r'^.*://.*/(.*)/.*$', r'\1', value)

value = os.getenv('REGISTRY_NAMESPACE', 'dogtagpki')
print('NAMESPACE: {value}'.format(value=value))
print('##vso[task.setvariable variable=NAMESPACE]{value}'.format(value=value))

Expand Down Expand Up @@ -62,8 +54,23 @@ jobs:
docker exec runner dnf install -y dnf-plugins-core rpm-build
if [ -n "$COPR_REPO" ]; then docker exec runner dnf copr enable -y $COPR_REPO; fi

docker create --name=jss-dist quay.io/$NAMESPACE/jss-dist:latest
docker cp jss-dist:/root/RPMS/. /tmp/RPMS
docker rm -f jss-dist

docker create --name=ldapjdk-dist quay.io/$NAMESPACE/ldapjdk-dist:latest
docker cp ldapjdk-dist:/root/RPMS/. /tmp/RPMS
docker rm -f ldapjdk-dist

docker create --name=idm-console-framework-dist quay.io/$NAMESPACE/idm-console-framework-dist:latest
docker cp idm-console-framework-dist:/root/RPMS/. /tmp/RPMS
docker rm -f idm-console-framework-dist

docker exec runner mkdir -p RPMS
docker cp /tmp/RPMS/. runner:RPMS
docker exec runner bash -c "dnf install -y RPMS/*"

docker exec runner dnf builddep -y --spec /root/src/pki.spec
docker exec runner dnf install -y dogtag-console-framework
displayName: Install PKI dependencies

- script: |
Expand Down
2 changes: 1 addition & 1 deletion pki.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ BuildRequires: policycoreutils

# Java build dependencies
BuildRequires: %{java_devel}
BuildRequires: maven-local-openjdk17
Copy link
Member

Choose a reason for hiding this comment

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

Which is the jdk installed in this case?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The java_devel is still defined as java-17-openjdk-devel, so it should install OpenJDK 17.

The Maven dependency was originally defined as maven-local, which works fine on Fedora 39, but on Fedora 40 it seems to be pulling OpenJDK 21 in addition to OpenJDK 17. I was trying to complete Fedora 40 support first and then add OpenJDK 21 support separately later, so I changed the dependency to maven-local-openjdk17 specifically, but apparently this package is not available on CentOS/RHEL, so for now it's reverted back to maven-local.

BuildRequires: maven-local
%if 0%{?fedora}
BuildRequires: xmvn-tools
%endif
Expand Down
Loading