From d00e5123ae99ca85563773144d4decb2f38b2b2a Mon Sep 17 00:00:00 2001 From: Arthur Bellal Date: Thu, 9 Jan 2025 13:44:16 +0100 Subject: [PATCH] (fleet) fix the version used to reference the installer from the install scripts (#32805) --- .gitlab/package_build/installer.yml | 11 ++++++----- tasks/installer.py | 5 ----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.gitlab/package_build/installer.yml b/.gitlab/package_build/installer.yml index d3a15c2684dda..377e25287e3ca 100644 --- a/.gitlab/package_build/installer.yml +++ b/.gitlab/package_build/installer.yml @@ -101,12 +101,13 @@ installer-install-scripts: RELEASE_VERSION: "$RELEASE_VERSION_7" script: - !reference [.retrieve_linux_go_deps] - - echo "About to build for $RELEASE_VERSION" + - VERSION="$(inv agent.version --url-safe)-1" || exit $? + - echo "About to build for $VERSION" - mkdir -p $OMNIBUS_PACKAGE_DIR - - inv -e installer.build-linux-script "default" "$RELEASE_VERSION" - - inv -e installer.build-linux-script "databricks" "$RELEASE_VERSION" - - inv -e installer.build-linux-script "emr" "$RELEASE_VERSION" - - inv -e installer.build-linux-script "dataproc" "$RELEASE_VERSION" + - inv -e installer.build-linux-script "default" "$VERSION" + - inv -e installer.build-linux-script "databricks" "$VERSION" + - inv -e installer.build-linux-script "emr" "$VERSION" + - inv -e installer.build-linux-script "dataproc" "$VERSION" - mv ./bin/installer/install-*.sh $OMNIBUS_PACKAGE_DIR/ - ls -la $OMNIBUS_PACKAGE_DIR artifacts: diff --git a/tasks/installer.py b/tasks/installer.py index 381c2dc104db8..9e758a96a3bac 100644 --- a/tasks/installer.py +++ b/tasks/installer.py @@ -10,7 +10,6 @@ from invoke.exceptions import Exit from tasks.build_tags import filter_incompatible_tags, get_build_tags, get_default_build_tags -from tasks.libs.common.git import get_commit_sha from tasks.libs.common.utils import REPO_PATH, bin_name, get_build_flags from tasks.libs.releasing.version import get_version @@ -107,10 +106,6 @@ def build_linux_script( with open(INSTALL_SCRIPT_TEMPLATE) as f: install_script = f.read() - # default version on pipelines, using the commit sha instead - if version == "nightly-a7": - version = get_commit_sha(ctx) - archs = ['amd64', 'arm64'] for arch in archs: build_downloader(ctx, flavor=flavor, version=version, os='linux', arch=arch)