From 6914230a356aea335397530e572dafd70b32df59 Mon Sep 17 00:00:00 2001 From: Maxim Tatar Date: Wed, 21 Dec 2022 15:37:47 -0500 Subject: [PATCH 1/3] JAIL-295 jenkins containerized-masking linux-pkg job fails due to changed .zip name PR URL: https://www.github.com/delphix/linux-pkg/pull/270 --- packages/containerized-masking/config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/containerized-masking/config.sh b/packages/containerized-masking/config.sh index e1b920d..ce87bce 100644 --- a/packages/containerized-masking/config.sh +++ b/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/" } From 67124850dbf619049a0e71d6b8dacde65dc2b403 Mon Sep 17 00:00:00 2001 From: Jules Tamagnan <77420472+jtamagnan-delphix@users.noreply.github.com> Date: Wed, 18 Jan 2023 09:00:10 -0800 Subject: [PATCH 2/3] TOOL-17737 Update the virtualization package to point to GitHub (#271) PR URL: https://www.github.com/delphix/linux-pkg/pull/271 --- README.md | 4 ++-- packages/virtualization/config.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 0ad06f1..e375b0a 100644 --- a/README.md +++ b/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//" +DEFAULT_PACKAGE_GIT_URL="https://github.com/delphix/" ``` #### Step 2. Add package hooks diff --git a/packages/virtualization/config.sh b/packages/virtualization/config.sh index aa33fe8..0e9207c 100644 --- a/packages/virtualization/config.sh +++ b/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() { From 9662eec13991e7801fe2c428d51c7b04c157586d Mon Sep 17 00:00:00 2001 From: Prakash Surya Date: Mon, 23 Jan 2023 10:32:29 -0800 Subject: [PATCH 3/3] TOOL-17954 Add environment variable to fix cloud-init build (#272) --- packages/cloud-init/config.sh | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/packages/cloud-init/config.sh b/packages/cloud-init/config.sh index e14bbe8..dd72065 100644 --- a/packages/cloud-init/config.sh +++ b/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 }