fixes for ojdk21 rpms

Author: jandrlik

config/global_config.py

@@ -166,6 +166,6 @@ def get_32b_arch_identifiers_in_scriptlets(arch):
 LIST_OF_POSSIBLE_VENDORS = LIST_OF_PROPRIETARY_VENDORS + LIST_OF_OPEN_VENDORS
 LIST_OF_POSSIBLE_VENDORS_WITHOUT_ITW = LIST_OF_PROPRIETARY_VENDORS + LIST_OF_OPEN_VENDORS_EXCEPT_ITW
 LIST_OF_LEGACY_VERSIONS = ["1.7.0", "1.8.0"]
-LIST_OF_NEW_VERSIONS = ["11", "17", "latest"]
+LIST_OF_NEW_VERSIONS = ["11", "17", "21", "latest"]
 LIST_OF_POSSIBLE_VERSIONS = [ITW] + LIST_OF_LEGACY_VERSIONS + LIST_OF_NEW_VERSIONS
 LIST_OF_POSSIBLE_VERSIONS_WITHOUT_ITW = LIST_OF_LEGACY_VERSIONS + LIST_OF_NEW_VERSIONS

testcases/alternativesTests/binaries_test_config_classes.py

@@ -224,8 +224,8 @@ class OpenJdkLatest(OpenJdk11):
                       'jconsole',
                       'jdb', 'jdeprscan', 'jdeps', 'jhsdb', 'jimage', 'jinfo', 'jlink', 'jmap', 'jmod', 'jps',
                       'jrunscript',
-                      'jshell', 'jstack', 'jstat', 'jstatd', 'serialver', 'jfr', 'jpackage']
-    HEADLESS_BINARIES = ["java", "keytool", "rmiregistry", 'alt-java']
+                      'jshell', 'jstack', 'jstat', 'jstatd', 'serialver', 'jfr', 'jpackage', 'jwebserver']
+    HEADLESS_BINARIES = ["java", "keytool", "rmiregistry"]
 
     def remove_binaries_without_slaves(self, args=None):
         subpackage = self._get_jre_subpackage()[0]

testcases/nameTest/subpackages_test.py

@@ -238,9 +238,9 @@ def _getSubPackages(self):
             subpackages.update(self._get_debug_debuginfo())
             subpackages.update(self._get_debuginfo())
             subpackages.update({"src" + suffix})
+            subpackages.discard('accessibility' + suffix)
 
-        subpackages.discard('accessibility-slowdebug')
-        subpackages.discard('accessibility-fastdebug')
+        subpackages.discard("demo")
         return subpackages
 
 

testcases/priorityTest/postinstall_master_test.py

@@ -216,15 +216,39 @@ def _generate_masters(self):
         return masters
 
 
-class OpenJdk13(OpenJdk9OtherArchs):
+class OpenJdk17(OpenJdk9OtherArchs):
     def _generate_masters(self):
-        masters = super(OpenJdk13, self)._generate_masters()
+        masters = super(OpenJdk17, self)._generate_masters()
         return masters
 
 
-class OpenJdk13arm7vhl(OpenJdk9Armvhl):
+class OpenJdk17arm7vhl(OpenJdk9Armvhl):
     def _generate_masters(self):
-        masters = super(OpenJdk13arm7vhl, self)._generate_masters()
+        masters = super(OpenJdk17arm7vhl, self)._generate_masters()
+        return masters
+
+
+class OpenJdk21(OpenJdk17):
+    def _generate_masters(self):
+        masters = super(OpenJdk21, self)._generate_masters()
+        masters[JAVADOC].append(JAVADOCDIR + "_" + self._get_version() + "_" + self._get_vendor())
+        masters[JAVADOC].append(JAVADOCDIR + "_" + self._get_version())
+        masters[JAVADOC].append(JAVADOCDIR + "_" + self._get_vendor())
+        masters[JAVADOC_ZIP].append(JAVADOCZIP + "_" + self._get_vendor())
+        masters[JAVADOC_ZIP].append(JAVADOCZIP + "_" + self._get_version())
+        masters[JAVADOC_ZIP].append(JAVADOCZIP + "_" + self._get_version() + "_" + self._get_vendor())
+        return masters
+
+
+class OpenJdk21arm7vhl(OpenJdk17arm7vhl):
+    def _generate_masters(self):
+        masters = super(OpenJdk21arm7vhl, self)._generate_masters()
+        masters[JAVADOC].append(JAVADOCDIR + "_" + self._get_version() + "_" + self._get_vendor())
+        masters[JAVADOC].append(JAVADOCDIR + "_" + self._get_version())
+        masters[JAVADOC].append(JAVADOCDIR + "_" + self._get_vendor())
+        masters[JAVADOC_ZIP].append(JAVADOCZIP + "_" + self._get_vendor())
+        masters[JAVADOC_ZIP].append(JAVADOCZIP + "_" + self._get_version())
+        masters[JAVADOC_ZIP].append(JAVADOCZIP + "_" + self._get_version() + "_" + self._get_vendor())
         return masters
 
 
@@ -414,11 +438,17 @@ def setCSCH(self):
             elif int(rpms.getMajorVersionSimplified()) == 12:
                 self.csch = OpenJdk12OtherArches()
                 return
-            elif int(rpms.getMajorVersionSimplified()) >= 13:
+            elif int(rpms.getMajorVersionSimplified()) == 17:
+                if self.getCurrentArch() in gc.getArm32Achs():
+                    self.csch = OpenJdk17arm7vhl()
+                    return
+                self.csch = OpenJdk17()
+                return
+            elif int(rpms.getMajorVersionSimplified()) >= 21:
                 if self.getCurrentArch() in gc.getArm32Achs():
-                    self.csch = OpenJdk13arm7vhl()
+                    self.csch = OpenJdk21arm7vhl()
                     return
-                self.csch = OpenJdk13()
+                self.csch = OpenJdk21()
                 return
             else:
                 raise ex.UnknownJavaVersionException("Unknown JDK version.")

testcases/rpmTests/requires_test.py

@@ -36,7 +36,7 @@ def check_artificial_requires(self, this):
             given_requires = self._get_artificial_requires(filename)
             missing_requires = []
             for require in expected_requires:
-                if not tu.passed_or_failed(self, self._is_in_requires(require, given_requires), make_rpm_readable(filename) + " is missing reuqire: " + require):
+                if not tu.passed_or_failed(self, self._is_in_requires(require, given_requires), make_rpm_readable(filename) + " is missing require: " + require):
                     missing_requires.append(require)
 
         self._document(documentation)

utils/mock/mock_executor.py

@@ -41,7 +41,7 @@ class Mock:
         #            ,"/var"
     ]
 
-    def __init__(self, os="fedora", version="rawhide", arch="x86_64", command="mock"):
+    def __init__(self, os="fedora", version="37", arch="x86_64", command="mock"):
         """
         This is a base constructor for DefaultMock. Arguments should never be changed when initiating new instance,
         unless you need it for some valid reasons (so far, there are NONE).
@@ -79,7 +79,7 @@ def getResultDir(self):
         return self.getDir() + "/result"
 
     def mainCommand(self):
-        return [self.command, "--old-chroot", "-r", self.getMockName()]
+        return [self.command, "--isolation=simple", "-r", self.getMockName()]
 
     def mainCommandAsString(self):
         s = ""

utils/pkg_name_split.py

@@ -61,7 +61,10 @@ def _dot_split(name):
     name = name.strip()
     whole_end = get_dottedsuffix(name)
     period_parts = whole_end.split('.')
-    without_rpm = period_parts[:-1]
+    if "rpm" in period_parts:
+        without_rpm = period_parts[:-1]
+    else:
+        without_rpm = period_parts
     num_p = len(without_rpm)
     release = '.'.join(without_rpm[: num_p - 2])
     dist, arch = without_rpm[num_p - 2:]