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

README.md

@@ -606,7 +606,7 @@ dependencies can be installed by calling
 `install_build_deps_from_control_file()`.
 For other packages, you can usually find the build dependencies in the project's
 README. It is recommended to edit the `debian/control` file of the package
-to list the required build dependencies, so that 
+to list the required build dependencies, so that
 `install_build_deps_from_control_file()` can be used. Otherwise, you can also
 use the `install_pkgs()` lib function to install packages.
 
@@ -680,7 +680,7 @@ In `config.sh`, you'll need to define two variables:
 e.g.:
 
 ```
-DEFAULT_PACKAGE_GIT_URL="https://delphix.gitlab.com/<user>/<package>"
+DEFAULT_PACKAGE_GIT_URL="https://github.com/delphix/<package>"
 ```
 
 #### Step 2. Add package hooks

packages/cloud-init/config.sh

@@ -30,6 +30,25 @@ function checkstyle() {
 }
 
 function build() {
+	#
+	# We set this environment variable to coerce the "read-version"
+	# script (part of the cloud-init repository) to behave correctly
+	# (for us) when it's run as part of the cloud-init build system.
+	#
+	# Specifically, without this set, the cloud-init build system
+	# will attempt to dynamically set the package version based on
+	# the upstream git tags that it expects to exist. The problem
+	# for us, is these upstream git tags don't exist when we do the
+	# package build, and even if they did exist, our repository's
+	# git history is completely unrelated to the upstream git
+	# history, due to how we merge with Ubuntu (i.e. using Ubuntu's
+	# source package, rather than a git repository).
+	#
+	# Thus, without this settinng, the build will fail when it tries
+	# to dynamically set the package version.
+	#
+	export TRAVIS_PULL_REQUEST_BRANCH="upstream/"
+
 	logmust dpkg_buildpackage_default
 }
 

packages/containerized-masking/config.sh

@@ -71,6 +71,6 @@ function build() {
 		-PenvironmentName=linuxappliance \
 		:tools:docker:packageMaskingKubernetes
 
-	logmust cp -v tools/docker/build/masking-kubernetes.zip \
+	logmust cp -v tools/docker/build/masking-kubernetes*.zip \
 		"$WORKDIR/artifacts/"
 }

packages/virtualization/config.sh

@@ -16,7 +16,7 @@
 #
 # shellcheck disable=SC2034
 
-DEFAULT_PACKAGE_GIT_URL="https://gitlab.delphix.com/app/dlpx-app-gate.git"
+DEFAULT_PACKAGE_GIT_URL="https://github.com/delphix/dlpx-app-gate.git"
 PACKAGE_DEPENDENCIES="adoptopenjdk crypt-blowfish host-jdks"
 
 function prepare() {