PR#1: build with minimized dependencies, disable broken test to fix build - rpms/glassfish-hk2

rpms / glassfish-hk2

#1 build with minimized dependencies, disable broken test to fix build

Merged 4 years ago by decathorpe. Opened 4 years ago by decathorpe.

Unknown source master into master

build with minimized dependencies, disable broken test to fix build

Fabio Valentini • 4 years ago

9f094f4

.gitignore

file modified

+3 -1

		`@@ -1,3 +1,5 @@`
		`- /*.rpm`
		`+ /results_*`
		`+ /*.src.rpm`
		`+`
		`/glassfish-hk2-2.5.0.tar.gz`
		`/glassfish-hk2-extra-1.0.3.tar.gz`

glassfish-hk2.spec

file modified

+17 -2

		`@@ -1,11 +1,11 @@`
		`# Set this flag to build with reduced dependency set`
		`- %bcond_with jp_minimal`
		`+ %bcond_without jp_minimal`

		`%global extra_version 1.0.3`

		`Name: glassfish-hk2`
		`Version: 2.5.0`
		`- Release: 4%{?dist}`
		`+ Release: 5%{?dist}`
		`Summary: Glassfish Hundred Kilobytes Kernel`
		`License: EPL-2.0 or GPLv2 with exceptions`
		`URL: https://github.com/eclipse-ee4j/glassfish-hk2/`
		`@@ -58,6 +58,14 @@`
		`BuildRequires: mvn(org.testng:testng)`
		`%endif`

		`+ %if %{with jp_minimal}`
		`+ Obsoletes: glassfish-hk2-dependency-verifier < %{version}-%{release}`
		`+ Obsoletes: glassfish-hk2-dependency-visualizer < %{version}-%{release}`
		`+ Obsoletes: glassfish-hk2-guice-bridge < %{version}-%{release}`
		`+ Obsoletes: glassfish-hk2-spring-bridge < %{version}-%{release}`
		`+ Obsoletes: glassfish-hk2-osgi < %{version}-%{release}`
		`+ %endif`
		`+`
		`BuildArch: noarch`

		`%description`
		`@@ -310,6 +318,9 @@`
		`hk2-utils/src/test/java/org/glassfish/hk2/utilities/test/ValidatorTest.java`
		`%endif`

		`+ # FIXME remove a broken test`
		`+ rm hk2-runlevel/src/test/java/org/glassfish/hk2/runlevel/tests/listener/ListenerErrorTest.java`
dmoluguw commented 4 years ago I commented out this line and tried building. It built successfully in my COPR . Any reason why you are removing this test?
		`+`
		`# Remove pointless unused dependencies`
		`# Patch submitted upstream, see https://github.com/eclipse-ee4j/glassfish-hk2/pull/445`
		`%pom_remove_dep org.osgi:osgi_R4_core`
		`@@ -524,6 +535,10 @@`
		`%license LICENSE.md NOTICE.md`

		`%changelog`
		`+ * Thu Oct 10 2019 Fabio Valentini <decathorpe@gmail.com> - 2.5.0-5`
		`+ - Build only with minimized dependencies.`
		`+ - Remove a broken test to fix the build.`
		`+`
		`* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.0-4`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild`

decathorpe commented 4 years ago

flip jp_minimal bcond to build with reduced functionality
disable a broken test to fix the build (probably applicable to fedora 30, 31, and rawhide)
add missing Obsoletes for the removed subpackages

This fixes the FTBFS issue on fedora rawhide and f31 (and removing the broken test probably also fixes the FTBFS issue on f30).

This PR can only be merged once the unretirement of maven-osgi is finished (a package re-review bug has been filed already):

https://bugzilla.redhat.com/show_bug.cgi?id=1760115

EDIT: maven-osgi is now available in rawhide, and if necessary, I can submit a buildroot override for it for f31 as well.

Test rebuilds of dependent packages were done in COPR:

https://copr.fedorainfracloud.org/coprs/decathorpe/glassfish-hk2-fixes-pr/monitor/

docker-client-java: already fails due to missing deps
grizzly: also has a PR to fix its build
jackson-jaxrs-providers: already fails due to missing deps
jaf: also fixed by this PR by making glassfish-hk2 installable again
jersey: already fails due to missing deps

dmoluguw commented on line 35 of glassfish-hk2.spec 4 years ago

I commented out this line and tried building. It built successfully in my COPR . Any reason why you are removing this test?

decathorpe commented 4 years ago

@dmoluguw looks like it's just an unreliable test. See for example on f30, the build fails about half the time ... https://koschei.fedoraproject.org/package/glassfish-hk2?collection=f30

the issue also triggered on every build on my machine. that's why I disabled the test

dmoluguw commented 4 years ago

ok. Thanks for the patch! This PR LGTM :)

Pull-Request has been merged by decathorpe

4 years ago

Metadata

Assignee

None

Tags

No Tags

Flags

simple-koji-ci

failure

Build failed for 9f094f4e