Skip to content

Commit

Permalink
(fleet) fix the version used to reference the installer from the inst…
Browse files Browse the repository at this point in the history
…all scripts (DataDog#32805)
  • Loading branch information
arbll authored Jan 9, 2025
1 parent af0d8cb commit d00e512
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 10 deletions.
11 changes: 6 additions & 5 deletions .gitlab/package_build/installer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
5 changes: 0 additions & 5 deletions tasks/installer.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit d00e512

Please sign in to comment.