DAOS-13813 ci: Move GHA build to Fedora 38 (daos-stack#12516)

Fix a couple of newer compiler warnings on Fedora 38 and move GHA to Fedora 38 to prevent new ones. Move developer build to ucx 1.14.1. The RPM update can be done independently or not at all. We only build the RPM to build DAOS. We use MOFED drivers when we actually use UCX at runtime. Signed-off-by: Jeff Olivier <[email protected]>
paul356 · Jun 29, 2023 · 0f206b1 · 0f206b1
1 parent 3d06890
commit 0f206b1
Show file tree

Hide file tree

Showing 12 changed files with 39 additions and 18 deletions.
diff --git a/.github/workflows/ci2.yml b/.github/workflows/ci2.yml
@@ -82,7 +82,7 @@ jobs:
             with: rockylinux/rockylinux:9
           - distro: fedora
             base: el.8
-            with: fedora:36
+            with: fedora:38
           - distro: leap.15
             base: leap.15
             with: opensuse/leap:15.4

diff --git a/.github/workflows/landing-builds.yml b/.github/workflows/landing-builds.yml
@@ -46,7 +46,7 @@ jobs:
             with: rockylinux/rockylinux:9
           - distro: fedora
             base: el.8
-            with: fedora:36
+            with: fedora:38
           - distro: leap.15
             base: leap.15
             with: opensuse/leap:15.4
@@ -156,7 +156,7 @@ jobs:
             with: rockylinux/rockylinux:9
           - distro: fedora
             base: el.8
-            with: fedora:36
+            with: fedora:38
           - distro: leap.15
             base: leap.15
             with: opensuse/leap:15.4

diff --git a/site_scons/components/__init__.py b/site_scons/components/__init__.py
@@ -159,6 +159,7 @@ def define_mercury(reqs):
                           ['make', 'install'],
                           ['mkdir', '-p', '$UCX_PREFIX/lib64/pkgconfig'],
                           ['cp', 'ucx.pc', '$UCX_PREFIX/lib64/pkgconfig']],
+                build_env={'CFLAGS': '-Wno-error'},
                 package='ucx-devel' if inst(reqs, 'ucx') else None)
 
     mercury_build = ['cmake',
@@ -228,6 +229,11 @@ def define_common(reqs):
 
     reqs.define('hwloc', libs=['hwloc'], headers=['hwloc.h'], package='hwloc-devel')
 
+    if ARM_PLATFORM:
+        reqs.define('ipmctl', skip_arch=True)
+    else:
+        reqs.define('ipmctl', headers=['nvm_management.h'], package='libipmctl-devel')
+
 
 def define_ompi(reqs):
     """OMPI and related components"""

diff --git a/site_scons/prereq_tools/base.py b/site_scons/prereq_tools/base.py
@@ -528,7 +528,7 @@ def run_build(self, opts):
         common_reqs = ['argobots', 'ucx', 'ofi', 'hwloc', 'mercury', 'boost', 'uuid',
                        'crypto', 'protobufc', 'lz4', 'isal', 'isal_crypto']
         client_reqs = ['fuse', 'json-c', 'capstone']
-        server_reqs = ['pmdk', 'spdk']
+        server_reqs = ['pmdk', 'spdk', 'ipmctl']
         test_reqs = ['cmocka']
 
         reqs = []
@@ -721,6 +721,7 @@ def define(self, name, **kw):
             extra_include_path -- Subdirectories to add to dependent component path
             out_of_src_build -- Build from a different directory if set to True
             build_env -- Environment variables to set for build
+            skip_arch -- not required on this architecture
         """
         use_installed = False
         if 'all' in self.installed or name in self.installed:
@@ -951,6 +952,7 @@ class _Component():
         out_of_src_build -- Build from a different directory if set to True
         patch_rpath -- Add appropriate relative rpaths to binaries
         build_env -- Environment variable(s) to add to build environment
+        skip_arch -- not required on this platform
     """
 
     def __init__(self,
@@ -992,6 +994,7 @@ def __init__(self,
         self.include_path.extend(kw.get("extra_include_path", []))
         self.out_of_src_build = kw.get("out_of_src_build", False)
         self.patch_path = self.prereqs.get_build_dir()
+        self.skip_arch = kw.get("skip_arch", False)
 
     @staticmethod
     def _sanitize_patch_path(path):
@@ -1128,6 +1131,10 @@ def has_missing_targets(self, env):
         if self.targets_found:
             return False
 
+        if self.skip_arch:
+            self.targets_found = True
+            return False
+
         if self.__check_only:
             # Temporarily turn off dry-run.
             env.SetOption('no_exec', False)
@@ -1216,6 +1223,9 @@ def is_installed(self, needed_libs):
 
     def configure(self):
         """Setup paths for a required component"""
+        if self.skip_arch:
+            return
+
         if not self.retriever:
             self.prebuilt_path = "/usr"
         else:
@@ -1234,6 +1244,10 @@ def configure(self):
 
     def set_environment(self, env, needed_libs):
         """Modify the specified construction environment to build with the external component"""
+
+        if self.skip_arch:
+            return
+
         lib_paths = []
 
         # Make sure CheckProg() looks in the component's bin/ dir

diff --git a/src/bio/bio_wal.c b/src/bio/bio_wal.c
@@ -1670,7 +1670,7 @@ bio_wal_replay(struct bio_meta_context *mc, struct bio_wal_rp_stats *wrs,
 	uint64_t		 tx_id, start_id, unmap_start, unmap_end;
 	int			 rc;
 	uint64_t		 total_bytes = 0, rpl_entries = 0, total_tx = 0;
-	uint64_t		 s_us;
+	uint64_t                 s_us = 0;
 
 	D_ALLOC(buf, max_blks * blk_bytes);
 	if (buf == NULL)

diff --git a/src/cart/crt_internal_types.h b/src/cart/crt_internal_types.h
@@ -311,7 +311,7 @@ struct crt_opc_map {
 	struct crt_opc_map_L2	*com_map;
 };
 
-
-void crt_na_config_fini(bool primary, int provider);
+void
+crt_na_config_fini(bool primary, crt_provider_t provider);
 
 #endif /* __CRT_INTERNAL_TYPES_H__ */
diff --git a/src/client/java/daos-java/pom.xml b/src/client/java/daos-java/pom.xml
@@ -295,7 +295,7 @@
                   <exclude>org.javassist:javassist</exclude>
                 </excludes>
               </artifactSet>
-              <finalName>${artifactId}-${version}-protobuf3-netty4-shaded</finalName>
+              <finalName>${project.artifactId}-${project.version}-protobuf3-netty4-shaded</finalName>
             </configuration>
           </execution>
         </executions>
@@ -314,7 +314,7 @@
             <configuration>
               <artifacts>
                 <artifact>
-                  <file>target/${artifactId}-${version}-protobuf3-netty4-shaded.jar</file>
+                  <file>target/${project.artifactId}-${project.version}-protobuf3-netty4-shaded.jar</file>
                   <type>jar</type>
                   <classifier>protobuf3-netty4-shaded</classifier>
                 </artifact>
@@ -484,7 +484,7 @@
                 <configuration>
                   <artifacts>
                     <artifact>
-                      <file>target/${artifactId}-${version}-shaded.jar</file>
+                      <file>target/${project.artifactId}-${project.version}-shaded.jar</file>
                       <type>jar</type>
                       <classifier>all-shaded</classifier>
                     </artifact>

diff --git a/src/client/java/hadoop-daos/pom.xml b/src/client/java/hadoop-daos/pom.xml
@@ -190,7 +190,7 @@
                   <include>com.google.protobuf:protobuf-java</include>
                 </includes>
               </artifactSet>
-              <finalName>${artifactId}-${version}-protobuf3-netty4-shaded</finalName>
+              <finalName>${project.artifactId}-${project.version}-protobuf3-netty4-shaded</finalName>
             </configuration>
           </execution>
         </executions>
@@ -209,7 +209,7 @@
             <configuration>
               <artifacts>
                 <artifact>
-                  <file>target/${artifactId}-${version}-protobuf3-netty4-shaded.jar</file>
+                  <file>target/${project.artifactId}-${project.version}-protobuf3-netty4-shaded.jar</file>
                   <type>jar</type>
                   <classifier>protobuf3-netty4-shaded</classifier>
                 </artifact>
@@ -333,7 +333,7 @@
                 <configuration>
                   <artifacts>
                     <artifact>
-                      <file>target/${artifactId}-${version}-shaded.jar</file>
+                      <file>target/${project.artifactId}-${project.version}-shaded.jar</file>
                       <type>jar</type>
                       <classifier>all-shaded</classifier>
                     </artifact>

diff --git a/src/object/tests/srv_checksum_tests.c b/src/object/tests/srv_checksum_tests.c
@@ -289,9 +289,9 @@ fetch_csum_verify_bsgl_with_args(struct vos_fetch_test_context *ctx)
 #define ASSERT_CSUM(ctx, csum) \
 	assert_memory_equal(csum, ctx.iod_csum->ic_data->cs_csum, \
 		sizeof(csum) - 1)
-#define ASSERT_CSUM_EMPTY(ctx, idx) \
-	assert_string_equal("", ctx.iod_csum->ic_data->cs_csum + \
-	(idx * ctx.iod_csum->ic_data->cs_len))
+#define ASSERT_CSUM_EMPTY(ctx, idx)                                                                \
+	assert_int_equal(                                                                          \
+	    0, *(ctx.iod_csum->ic_data->cs_csum + (idx * ctx.iod_csum->ic_data->cs_len)))
 #define ASSERT_CSUM_IDX(ctx, csum, idx) \
 	assert_memory_equal(csum, ctx.iod_csum->ic_data->cs_csum + \
 	(idx * ctx.iod_csum->ic_data->cs_len), \

diff --git a/utils/build.config b/utils/build.config
@@ -10,7 +10,7 @@ SPDK = v22.01.2
 OFI = v1.18.0
 MERCURY = v2.3.0
 PROTOBUFC = v1.3.3
-UCX=v1.13.0
+UCX=v1.14.1
 
 [patch_versions]
 spdk=https://github.com/spdk/spdk/commit/b0aba3fcd5aceceea530a702922153bc75664978.diff,https://github.com/spdk/spdk/commit/445a4c808badbad3942696ecf16fa60e8129a747.diff

diff --git a/utils/docker/Dockerfile.el.8 b/utils/docker/Dockerfile.el.8
@@ -156,6 +156,7 @@ ARG DAOS_JAVA_BUILD=$DAOS_BUILD
 RUN [ "$DAOS_JAVA_BUILD" != "yes" ] || {                                                      \
         mkdir /home/daos/.m2 &&                                                               \
         cp /home/daos/daos/utils/scripts/helpers/maven-settings.xml.in /home/daos/.m2/settings.xml &&      \
+        export JAVA_HOME=$(daos-java/find_java_home.sh) && \
         mvn clean install -T 1C                                                               \
             -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
             -DskipITs -Dgpg.skip -Ddaos.install.path=/opt/daos;                               \

diff --git a/utils/scripts/install-el8.sh b/utils/scripts/install-el8.sh
@@ -10,7 +10,7 @@
 
 set -e
 
-arch=$(uname -i)
+arch=$(uname -m)
 
 dnf --nodocs install \
     boost-python3-devel \