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

packages/containerized-masking/config.sh

@@ -24,7 +24,7 @@
 # only works with packages that are included in the appliance, which this one
 # isn't.
 #
-DEFAULT_PACKAGE_GIT_URL="https://gitlab.delphix.com/masking/dms-core-gate.git"
+DEFAULT_PACKAGE_GIT_URL="https://github.com/delphix/dms-core-gate.git"
 
 PACKAGE_DEPENDENCIES="adoptopenjdk"
 SKIP_COPYRIGHTS_CHECK=true

packages/masking/config.sh

@@ -16,7 +16,7 @@
 #
 # shellcheck disable=SC2034
 
-DEFAULT_PACKAGE_GIT_URL="https://gitlab.delphix.com/masking/dms-core-gate.git"
+DEFAULT_PACKAGE_GIT_URL="https://github.com/delphix/dms-core-gate.git"
 PACKAGE_DEPENDENCIES="adoptopenjdk"
 
 function prepare() {

packages/virtualization/config.sh

@@ -102,7 +102,6 @@ function build() {
 
 	if [[ -n "$DELPHIX_RELEASE_VERSION" ]]; then
 		args+=("-DhotfixGenDlpxVersion=$DELPHIX_RELEASE_VERSION")
-		args+=("-Dbuild.legacy.resources.war=true")
 	fi
 
 	logmust ant "${args[@]}" all-secrets package

setup.sh

@@ -86,18 +86,30 @@ function configure_apt_sources() {
 # we add a swap file to prevent the oom-killer from terminating the build.
 #
 function add_swap() {
-	local swapfile="/swapfile"
-	local size="4G"
+	local rootfs
+	local swapfile
 
-	if [[ ! -f "$swapfile" ]]; then
-		logmust sudo fallocate -l "$size" "$swapfile"
-		logmust sudo chmod 600 /swapfile
-		logmust sudo mkswap /swapfile
+	swapfile="/swapfile"
+	rootfs=$(awk '$2 == "/" { print $3 }' /proc/self/mounts)
+
+	#
+	# If the root filesystem is ZFS, we assume we're running on a
+	# Delphix based buildserver, and assume swap is already enabled;
+	# the Delphix buildserver should enable swap for us.
+	#
+	if [[ "$rootfs" == "zfs" ]]; then
+		return
 	fi
 
-	if ! sudo swapon --show | grep -q "$swapfile"; then
-		logmust sudo swapon "$swapfile"
+	# Swap already enabled, nothing to do.
+	if sudo swapon --show | grep -q "$swapfile"; then
+		return
 	fi
+
+	logmust sudo fallocate -l 4G "$swapfile"
+	logmust sudo chmod 600 "$swapfile"
+	logmust sudo mkswap "$swapfile"
+	logmust sudo swapon "$swapfile"
 }
 
 logmust configure_apt_sources
@@ -116,9 +128,11 @@ logmust sudo apt-get update
 # - jq is used to generate a JSON formatted metadata file by some packages.
 #
 logmust install_pkgs \
+	build-essential \
 	debhelper \
 	devscripts \
 	equivs \
+	rsync \
 	shellcheck \
 	jq