From 306dfad018cac506dbb22c594262bda2ba704145 Mon Sep 17 00:00:00 2001 From: Paul Dagnelie Date: Wed, 17 May 2023 21:43:17 -0700 Subject: [PATCH 1/4] TOOL-21304 Add support for delphix-go repository to linux-pkg (#287) --- package-lists/build/main.pkgs | 1 + packages/delphix-go/config.sh | 24 ++++++++++++++++++++++++ packages/zfs/config.sh | 3 ++- 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100755 packages/delphix-go/config.sh diff --git a/package-lists/build/main.pkgs b/package-lists/build/main.pkgs index 723685e4..697fa1d7 100644 --- a/package-lists/build/main.pkgs +++ b/package-lists/build/main.pkgs @@ -9,6 +9,7 @@ challenge-response cloud-init crash-python crypt-blowfish +delphix-go delphix-platform delphix-rust delphix-sso-app diff --git a/packages/delphix-go/config.sh b/packages/delphix-go/config.sh new file mode 100755 index 00000000..f9926295 --- /dev/null +++ b/packages/delphix-go/config.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash +# +# Copyright 2021 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/delphix-go.git" + +function build() { + logmust mkdir -p "$WORKDIR/repo" + logmust dpkg_buildpackage_default +} diff --git a/packages/zfs/config.sh b/packages/zfs/config.sh index 4b9ef5bf..69ec7d09 100644 --- a/packages/zfs/config.sh +++ b/packages/zfs/config.sh @@ -17,7 +17,7 @@ # shellcheck disable=SC2034 DEFAULT_PACKAGE_GIT_URL="https://github.com/delphix/zfs.git" -PACKAGE_DEPENDENCIES="@linux-kernel delphix-rust dwarves" +PACKAGE_DEPENDENCIES="@linux-kernel delphix-rust delphix-go dwarves" UPSTREAM_GIT_URL="https://github.com/openzfs/zfs.git" UPSTREAM_GIT_BRANCH="master" @@ -56,6 +56,7 @@ function prepare() { zlib1g-dev logmust install_kernel_headers logmust install_pkgs "$DEPDIR"/delphix-rust/*.deb + logmust install_pkgs "$DEPDIR"/delphix-go/*.deb logmust install_pkgs "$DEPDIR"/dwarves/*.deb } From 00e0ab9bb07ce74a0d82df85d3ce9797c0b8fc97 Mon Sep 17 00:00:00 2001 From: Raul Santelices Date: Thu, 18 May 2023 23:49:29 -0400 Subject: [PATCH 2/4] DLPX-86188 [insight] Unknown command fluentd error while creating insight config PR URL: https://www.github.com/delphix/linux-pkg/pull/289 --- packages/misc-debs/config.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/misc-debs/config.sh b/packages/misc-debs/config.sh index 36225319..3fc41b3b 100644 --- a/packages/misc-debs/config.sh +++ b/packages/misc-debs/config.sh @@ -47,7 +47,10 @@ SKIP_COPYRIGHTS_CHECK=true function fetch() { logmust cd "$WORKDIR/artifacts" - local debs=() + local debs=( + # Copied from https://s3.amazonaws.com/packages.treasuredata.com/4/ubuntu/focal/pool/contrib/t/td-agent/td-agent_4.4.2-1_arm64.deb + "td-agent_4.4.2-1_amd64.deb b40c1883c3849e9a7bf67762c9f9a87a6119ad98f1fae64a83d754e1275a379a" + ) local url="http://artifactory.delphix.com/artifactory/linux-pkg/misc-debs" From 4ec42a14c72f491ea19719398099f6b4f946f19b Mon Sep 17 00:00:00 2001 From: Palash Gandhi <87093175+pgandhi-delphix@users.noreply.github.com> Date: Wed, 7 Jun 2023 09:43:26 -0700 Subject: [PATCH 3/4] TOOL-21507 linux-pkg should fetch releases from new release dataset paths (#291) PR URL: https://www.github.com/delphix/linux-pkg/pull/291 --- setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.sh b/setup.sh index 98818119..9be7405f 100755 --- a/setup.sh +++ b/setup.sh @@ -33,7 +33,7 @@ function configure_apt_sources() { if [[ -z "$primary_url" ]] || [[ -z "$secondary_url" ]]; then local latest_url="http://linux-package-mirror.delphix.com/" if is_release_branch; then - package_mirror_url="${latest_url}${DEFAULT_GIT_BRANCH}" + package_mirror_url="${latest_url}releases/${DELPHIX_RELEASE_VERSION}" else latest_url+="${DEFAULT_GIT_BRANCH}/latest/" package_mirror_url=$(curl -LfSs -o /dev/null -w '%{url_effective}' \ From 6c9422dd69050f630773082b882873e9f4a4e35e Mon Sep 17 00:00:00 2001 From: Palash Gandhi <87093175+pgandhi-delphix@users.noreply.github.com> Date: Wed, 7 Jun 2023 14:20:03 -0700 Subject: [PATCH 4/4] TOOL-21529 linux-pkg PR checks broken because verify-query-packages fails (#292) PR URL: https://github.com/delphix/linux-pkg/pull/292 --- .github/scripts/verify-query-packages.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/verify-query-packages.sh b/.github/scripts/verify-query-packages.sh index c91afc45..65cc85f0 100755 --- a/.github/scripts/verify-query-packages.sh +++ b/.github/scripts/verify-query-packages.sh @@ -72,7 +72,7 @@ test "$(TARGET_KERNEL_FLAVORS=generic ./query-packages.sh list linux-kernel)" == # Check that when a package has multiple dependencies they are printed in the # expected format. test "$(TARGET_KERNEL_FLAVORS="generic aws" ./query-packages.sh single -o dependencies zfs)" == \ - "linux-kernel-generic,linux-kernel-aws,delphix-rust,dwarves" + "linux-kernel-generic,linux-kernel-aws,delphix-rust,delphix-go,dwarves" # Check that the output from the appliance list contains zfs and # delphix-platform packages. Note, we explicitly do not use grep -q here as it