Retry pulling the JPV image

Use version 1 of JPV
Revert "Fix check arguments passed to script"
2023-10-26 11:54:53 +02:00 · 2023-10-20 10:04:55 +02:00 · 2023-10-19 15:34:48 +02:00 · 2023-10-19 15:11:56 +02:00 · 2023-08-22 11:01:14 +02:00 · 2023-08-22 10:34:30 +02:00
3 changed files with 4 additions and 2 deletions
--- a/jp_validator.sh
+++ b/jp_validator.sh
@ -4,6 +4,8 @@ set -eu

 # /mnt/envroot required by SymlinkConfig

+podman pull "${JP_VALIDATOR_IMAGE}" || sleep 60
+
 exec podman run --rm --security-opt='label=disable'\
 --mount type=bind,source="${TEST_ARTIFACTS}",target='/mnt/test_artifacts/',readonly\
 --mount type=bind,source='src/',target='/mnt/config/',readonly\
--- a/src/BytecodeVersionConfigJP.java
+++ b/src/BytecodeVersionConfigJP.java
@ -60,7 +60,7 @@ public class BytecodeVersionConfigJP implements BytecodeVersionConfig {
            return version <= 44 + Integer.parseInt(className.substring(18, className.indexOf('/', 18)));
        }

-        if (className.equals("module-info.class")) {
+        if (className.equals("module-info.class") || className.endsWith("/package-info.class")) {
            return true;
        }

--- a/tests.fmf
+++ b/tests.fmf
@ -6,7 +6,7 @@ require:
  - podman
 environment:
  TEST_ARTIFACTS: /var/share/test-artifacts
-  JP_VALIDATOR_IMAGE: quay.io/mizdebsk/javapackages-validator
+  JP_VALIDATOR_IMAGE: quay.io/fedora-java/javapackages-validator:1
  ENVROOT: /

 /symlink:
Author	SHA1	Message	Date
Marian Koncek	a12ae3f587	Retry pulling the JPV image	2023-10-26 11:54:53 +02:00
Marian Koncek	190ba5074e	Use version 1 of JPV	2023-10-20 10:04:55 +02:00
Marian Koncek	0eaeaf2232	Revert "Fix check arguments passed to script" This reverts commit `68df864804`.	2023-10-19 15:34:48 +02:00
Marian Koncek	68df864804	Fix check arguments passed to script	2023-10-19 15:11:56 +02:00
Mikolaj Izdebski	c5de23f01f	Fix package-info.class bytecode version exemption	2023-08-22 11:01:14 +02:00
Mikolaj Izdebski	5e5396448b	Exempt package-info.class from bytecode version check	2023-08-22 10:34:30 +02:00