Stop relying on internal sources in favor of upstream packages for LT…

…S upgrade

PR URL: https://www.github.com/delphix/linux-pkg/pull/325

.github/scripts/verify-query-packages.sh

@@ -30,14 +30,6 @@ read -r -a fields <<<"$(./query-packages.sh single -o git-url zfs 2>&1)"
 test ${#fields[@]} -eq 1
 test "${fields[0]}" == 'https://github.com/delphix/zfs.git'
 
-# Expect: "bpftrace	bcc	true	https://github.com/delphix/bpftrace.git"
-read -r -a fields <<<"$(./query-packages.sh single -o name,dependencies,can-update,git-url bpftrace 2>&1)"
-test ${#fields[@]} -eq 4
-test "${fields[0]}" == 'bpftrace'
-test "${fields[1]}" == 'bcc'
-test "${fields[2]}" == 'true'
-test "${fields[3]}" == 'https://github.com/delphix/bpftrace.git'
-
 # Expect that "list all" outputs all directory names under packages/
 diff <(ls -1 packages | sort) <(./query-packages.sh list all 2>&1 | sort)
 

README.md

@@ -280,12 +280,7 @@ of some of the scripts defined above.
 
 * **package_S3_URL**: Similar to the package_VAR variables above. This is used
   to override the default S3 location for where package build-dependencies are
-  fetched for a given linux-pkg package. For instance, if you are building
-  bpftrace, which has `PACKAGE_DEPENDENCIES="bcc"` in its config, the
-  `fetch_dependencies()` stage in the build will fetch the latest build
-  artifacts of the bcc package from a predetermined S3 location. If you pass
-  `BCC_S3_URL=s3://path/to/custom/bcc/artifacts` then those artifacts will be
-  fetched insteasd.
+  fetched for a given linux-pkg package.
 
 * **DELPHIX_PACKAGE_MIRROR_MAIN, DELPHIX_PACKAGE_MIRROR_SECONDARY**: When
   the [setup.sh](#setupsh) script is run, it will configure the apt sources

package-lists/build/main.pkgs

@@ -2,9 +2,6 @@
 # List of non-kernel packages to be included in the Delphix Appliance.
 #
 
-adoptopenjdk
-bcc
-bpftrace
 challenge-response
 cloud-init
 crash-python
@@ -13,20 +10,15 @@ delphix-go
 delphix-platform
 delphix-rust
 delphix-sso-app
-drgn
 docker-python-image
 dwarves
-fio
 fluentd-gems
-gdb-python
 grub2
 host-jdks
-libkdumpfile
 make-jpkg
 makedumpfile
 masking
 misc-debs
-mold
 nfs-utils
 performance-diagnostics
 ptools

packages/containerized-masking/config.sh

@@ -29,23 +29,22 @@ source "$PWD/lib/common.sh"
 
 DEFAULT_PACKAGE_GIT_URL="https://github.com/delphix/dms-core-gate.git"
 
-PACKAGE_DEPENDENCIES="adoptopenjdk"
 SKIP_COPYRIGHTS_CHECK=true
 
 function prepare() {
-	logmust install_pkgs "$DEPDIR"/adoptopenjdk/*.deb
+	echo "Nothing to prepare"
 }
 
 function build() {
-	export JAVA_HOME
-	JAVA_HOME=$(cat "$DEPDIR/adoptopenjdk/JDK_PATH") ||
-		die "Failed to read $DEPDIR/adoptopenjdk/JDK_PATH"
+  export JAVA_HOME
+  JAVA_HOME="/usr/lib/jvm/java-8-openjdk-amd64/"
 
 	logmust cd "$WORKDIR/repo"
 
 	local args=()
 
 	set_secret_build_args
+	args+=("-Dorg.gradle.java.home=/lib/jvm/java-8-openjdk-amd64/")
 	args+=("${_SECRET_BUILD_ARGS[@]}")
 
 	args+=("-Porg.gradle.configureondemand=false")

packages/delphix-sso-app/config.sh

@@ -17,16 +17,14 @@
 # shellcheck disable=SC2034
 
 DEFAULT_PACKAGE_GIT_URL="https://github.com/delphix/saml-app.git"
-PACKAGE_DEPENDENCIES="adoptopenjdk"
 
 function prepare() {
-	logmust install_pkgs "$DEPDIR"/adoptopenjdk/*.deb
+	echo "Nothing to prepare"
 }
 
 function build() {
-	local java_home
-	java_home=$(cat "$DEPDIR/adoptopenjdk/JDK_PATH") ||
-		die "Failed to read $DEPDIR/adoptopenjdk/JDK_PATH"
+  local java_home
+  java_home="/usr/lib/jvm/java-8-openjdk-amd64/"
 	logmust cd "$WORKDIR/repo"
 	logmust sudo ./gradlew "-Dorg.gradle.java.home=$java_home" distDeb
 	logmust sudo mv ./build/distributions/*deb "$WORKDIR/artifacts/"