Merge remote-tracking branch 'origin/6.0/stage' into 6.0/release

Author: Delphix User

lib/common.sh

@@ -1075,9 +1075,8 @@ function get_kernel_version_for_platform_from_apt() {
 	# available, it is not always the case.
 	#
 
-	if [[ "$platform" == generic ]] &&
-		[[ "$UBUNTU_DISTRIBUTION" == bionic ]]; then
-		package=linux-image-generic-hwe-18.04
+	if [[ "$platform" != generic ]] && [[ "$UBUNTU_DISTRIBUTION" == focal ]]; then
+		package="linux-image-${platform}-lts-20.04"
 	else
 		package="linux-image-${platform}"
 	fi

package-lists/build/main.pkgs

@@ -14,6 +14,7 @@ delphix-rust
 delphix-sso-app
 drgn
 docker-python-image
+fio
 fluentd-gems
 gdb-python
 grub2

packages/adoptopenjdk/config.sh

@@ -19,9 +19,15 @@
 DEFAULT_PACKAGE_GIT_URL=none
 PACKAGE_DEPENDENCIES="make-jpkg"
 
-_tarfile="OpenJDK8U-jdk_x64_linux_hotspot_8u332b09.tar.gz"
-_tarfile_sha256="adc13a0a0540d77f0a3481b48f10d61eb203e5ad4914507d489c2de3bd3d83da"
-_jdk_path="/usr/lib/jvm/adoptopenjdk-java8-jdk-amd64"
+if [[ "$UPSTREAM_PRODUCT_BRANCH" == "master" ]]; then
+	_tarfile="OpenJDK8U-jdk_x64_linux_hotspot_8u342b07.tar.gz"
+	_tarfile_sha256="8252c0e11d542ea0f9ce6b8f147d1a2bea4a17e9fc299da270288f5a4f35b1f3"
+	_jdk_path="/usr/lib/jvm/adoptopenjdk-java8-jdk-amd64"
+else
+	_tarfile="OpenJDK8U-jdk_x64_linux_hotspot_8u332b09.tar.gz"
+	_tarfile_sha256="adc13a0a0540d77f0a3481b48f10d61eb203e5ad4914507d489c2de3bd3d83da"
+	_jdk_path="/usr/lib/jvm/adoptopenjdk-java8-jdk-amd64"
+fi
 
 function prepare() {
 	logmust install_pkgs "$DEPDIR"/make-jpkg/*.deb

packages/fio/config.sh

@@ -0,0 +1,41 @@
+#!/usr/bin/env bash
+#
+# Copyright 2018, 2022 Delphix
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# shellcheck disable=SC2034
+
+DEFAULT_PACKAGE_GIT_URL="https://github.com/delphix/fio.git"
+
+function prepare() {
+	logmust install_pkgs \
+		libaio-dev \
+		librdmacm-dev \
+		libibverbs-dev \
+		librbd-dev \
+		libgtk2.0-dev \
+		libcairo2-dev \
+		libnuma-dev \
+		flex \
+		bison \
+		libglusterfs-dev \
+		libpmem-dev \
+		libpmemblk-dev
+}
+
+function build() {
+	logmust cd "$WORKDIR/repo/"
+	logmust dpkg-buildpackage -b -us -uc
+	logmust mv "$WORKDIR"/*deb "$WORKDIR/artifacts/"
+}