Skip to content

Commit

Permalink
Update rpminspect test
Browse files Browse the repository at this point in the history
The pom.xml files have been updated to define the target
Java version using maven.compiler.release property. The
maven-compiler-plugin is no longer used so it has been
removed.

The pki-rpminspect.yaml has been updated to no longer
define the javabytecode requirement so it will use the
standard requirement for the platform.

The rpminspect test has been updated to call rpminpect
directly in separate steps to make it easier to inspect
the failures. The rpminspect.sh is no longer used so it
has been removed.

Currently the test is failing because some dependencies
were built with older Java bytecode versions. They need
to be rebuilt with the proper version.
  • Loading branch information
edewata committed Oct 1, 2024
1 parent f21fea7 commit a170126
Show file tree
Hide file tree
Showing 18 changed files with 164 additions and 132 deletions.
164 changes: 161 additions & 3 deletions .github/workflows/rpminspect-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,165 @@ jobs:
docker rm -f pki-dist
- name: Run rpminspect on SRPM and RPMs
# get RPM version and release number
VERSION=$(docker exec pki ls build/SRPMS | sed -e 's/^pki-\(.*\)\.src\.rpm$/\1/')
echo "VERSION: $VERSION"
echo "$VERSION" > VERSION
- name: Install rpminspect profile
run: |
docker exec pki ls -lR /usr/share/rpminspect/profiles
docker exec pki cp \
/usr/share/pki/tests/pki-rpminspect.yaml \
/usr/share/rpminspect/profiles/fedora
- name: Check pki SRPM
if: always()
run: |
docker exec pki rpminspect-fedora \
-p pki-rpminspect \
build/SRPMS/pki-*.src.rpm
- name: Check dogtag-pki RPM
if: always()
run: |
VERSION=$(cat VERSION)
docker exec pki rpminspect-fedora \
-p pki-rpminspect \
build/RPMS/dogtag-pki-$VERSION.*.rpm
- name: Check dogtag-pki-acme RPM
if: always()
run: |
VERSION=$(cat VERSION)
docker exec pki rpminspect-fedora \
-p pki-rpminspect \
build/RPMS/dogtag-pki-acme-$VERSION.*.rpm
- name: Check dogtag-pki-base RPM
if: always()
run: |
VERSION=$(cat VERSION)
docker exec pki rpminspect-fedora \
-p pki-rpminspect \
build/RPMS/dogtag-pki-base-$VERSION.*.rpm
- name: Check dogtag-pki-ca RPM
if: always()
run: |
VERSION=$(cat VERSION)
docker exec pki rpminspect-fedora \
-p pki-rpminspect \
build/RPMS/dogtag-pki-ca-$VERSION.*.rpm
- name: Check dogtag-pki-est RPM
if: always()
run: |
VERSION=$(cat VERSION)
docker exec pki rpminspect-fedora \
-p pki-rpminspect \
build/RPMS/dogtag-pki-est-$VERSION.*.rpm
- name: Check dogtag-pki-java RPM
if: always()
run: |
VERSION=$(cat VERSION)
docker exec pki rpminspect-fedora \
-p pki-rpminspect \
build/RPMS/dogtag-pki-java-$VERSION.*.rpm
- name: Check dogtag-pki-javadoc RPM
if: always()
run: |
VERSION=$(cat VERSION)
docker exec pki rpminspect-fedora \
-p pki-rpminspect \
build/RPMS/dogtag-pki-javadoc-$VERSION.*.rpm
- name: Check dogtag-pki-kra RPM
if: always()
run: |
VERSION=$(cat VERSION)
docker exec pki rpminspect-fedora \
-p pki-rpminspect \
build/RPMS/dogtag-pki-kra-$VERSION.*.rpm
- name: Check dogtag-pki-ocsp RPM
if: always()
run: |
VERSION=$(cat VERSION)
docker exec pki rpminspect-fedora \
-p pki-rpminspect \
build/RPMS/dogtag-pki-ocsp-$VERSION.*.rpm
- name: Check dogtag-pki-server RPM
if: always()
run: |
VERSION=$(cat VERSION)
docker exec pki rpminspect-fedora \
-p pki-rpminspect \
build/RPMS/dogtag-pki-server-$VERSION.*.rpm
- name: Check dogtag-pki-tests RPM
if: always()
run: |
VERSION=$(cat VERSION)
docker exec pki rpminspect-fedora \
-p pki-rpminspect \
build/RPMS/dogtag-pki-tests-$VERSION.*.rpm
- name: Check dogtag-pki-theme RPM
if: always()
run: |
VERSION=$(cat VERSION)
docker exec pki rpminspect-fedora \
-p pki-rpminspect \
build/RPMS/dogtag-pki-theme-$VERSION.*.rpm
- name: Check dogtag-pki-tks RPM
if: always()
run: |
VERSION=$(cat VERSION)
docker exec pki rpminspect-fedora \
-p pki-rpminspect \
build/RPMS/dogtag-pki-tks-$VERSION.*.rpm
- name: Check dogtag-pki-tools RPM
if: always()
run: |
VERSION=$(cat VERSION)
docker exec pki rpminspect-fedora \
-p pki-rpminspect \
build/RPMS/dogtag-pki-tools-$VERSION.*.rpm
- name: Check dogtag-pki-tools-debuginfo RPM
if: always()
run: |
VERSION=$(cat VERSION)
docker exec pki rpminspect-fedora \
-p pki-rpminspect \
build/RPMS/dogtag-pki-tools-debuginfo-$VERSION.*.rpm
- name: Check dogtag-pki-tps RPM
if: always()
run: |
VERSION=$(cat VERSION)
docker exec pki rpminspect-fedora \
-p pki-rpminspect \
build/RPMS/dogtag-pki-tps-$VERSION.*.rpm
- name: Check pki-debugsource RPM
if: always()
run: |
VERSION=$(cat VERSION)
docker exec pki rpminspect-fedora \
-p pki-rpminspect \
build/RPMS/pki-debugsource-$VERSION.*.rpm
- name: Check python3-dogtag-pki RPM
if: always()
run: |
docker exec pki cp /usr/share/pki/tests/pki-rpminspect.yaml /usr/share/rpminspect/profiles/fedora/pki-rpminspect.yaml
docker exec pki /usr/share/pki/tests/bin/rpminspect.sh
VERSION=$(cat VERSION)
docker exec pki rpminspect-fedora \
-p pki-rpminspect \
build/RPMS/python3-dogtag-pki-$VERSION.*.rpm
8 changes: 0 additions & 8 deletions base/acme/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,6 @@

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<release>17</release>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
Expand Down
8 changes: 0 additions & 8 deletions base/ca/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,6 @@

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<release>17</release>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
Expand Down
8 changes: 0 additions & 8 deletions base/common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -176,14 +176,6 @@

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<release>17</release>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
Expand Down
8 changes: 0 additions & 8 deletions base/console/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,6 @@
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<release>17</release>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
Expand Down
8 changes: 0 additions & 8 deletions base/est/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,6 @@

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<release>17</release>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
Expand Down
8 changes: 0 additions & 8 deletions base/kra/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,6 @@

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<release>17</release>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
Expand Down
8 changes: 0 additions & 8 deletions base/ocsp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,6 @@

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<release>17</release>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
Expand Down
8 changes: 0 additions & 8 deletions base/server-webapp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,6 @@

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<release>17</release>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
Expand Down
8 changes: 0 additions & 8 deletions base/server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,6 @@

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<release>17</release>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
Expand Down
8 changes: 0 additions & 8 deletions base/tks/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,6 @@

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<release>17</release>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
Expand Down
8 changes: 0 additions & 8 deletions base/tomcat-9.0/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,6 @@

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<release>17</release>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
Expand Down
8 changes: 0 additions & 8 deletions base/tomcat/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,6 @@

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<release>17</release>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
Expand Down
8 changes: 0 additions & 8 deletions base/tools/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,6 @@
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<release>17</release>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
Expand Down
8 changes: 0 additions & 8 deletions base/tps/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,6 @@

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<release>17</release>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
Expand Down
1 change: 1 addition & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<github.global.server>github</github.global.server>
<maven.compiler.release>17</maven.compiler.release>
</properties>

<modules>
Expand Down
12 changes: 0 additions & 12 deletions tests/bin/rpminspect.sh

This file was deleted.

Loading

0 comments on commit a170126

Please sign in to comment.