From eeaa880b934d4a25c2d39fed39b250aa1a1d7d46 Mon Sep 17 00:00:00 2001 From: Piotr Kolacz Date: Tue, 23 Jun 2026 12:12:24 +0200 Subject: [PATCH 1/9] fix: correct ec2-install.sh help text, typos, and license handling Found while testing the AWS EC2 quickstart end to end. - Help example referenced ./install.sh; the script is ec2-install.sh. - "tested with Ubuntu 24.04" -> 26.04, matching the quickstart guide. - Post-install message typo: setting.gradle.kts -> settings.gradle.kts. - -v/--version printed nothing: it referenced $Script_Version instead of the defined $SCRIPT_VERSION. - License path: drop the hard-coded ./ prefix so an absolute --license path also works (previously only a relative path resolved correctly). --- AWS/EC2/ec2-install.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/AWS/EC2/ec2-install.sh b/AWS/EC2/ec2-install.sh index e1d75a6..b732657 100644 --- a/AWS/EC2/ec2-install.sh +++ b/AWS/EC2/ec2-install.sh @@ -85,12 +85,12 @@ usage() { echo -e "${WHITE}${BOLD}Develocity Installation Script${NOFORMAT}" echo -e "\nUsage: $(basename "${BASH_SOURCE[0]}") [-h][-v][-l][-hn] [-u]" -echo -e "\n${WHITE}${BOLD}Example: ./install.sh -l develocity.license -hn develocity.example.io${NOFORMAT}" +echo -e "\n${WHITE}${BOLD}Example: ./ec2-install.sh -l develocity.license -hn develocity.example.io${NOFORMAT}" echo -e "\nThe script sets up a lightweight Kubernetes (K3s) environment in which Develocity is deployed using Helm." echo -e "The license (-l, --license) and hostname (-hn, --hostname) flags are always required." -echo -e "\nThe script is tested with Ubuntu 24.04 x86_64 (AMI)." +echo -e "\nThe script is tested with Ubuntu 26.04 x86_64 (AMI)." echo -e "If you have questions please contact the Develocity support team." @@ -254,7 +254,7 @@ installPlatformChart(){ ge-standalone \ gradle/gradle-enterprise-standalone \ --set global.hostname="${hostname}" \ - --set-file global.license.file=./"${license}" \ + --set-file global.license.file="${license}" \ || exitError "Failed to install the Develocity Helm chart" } @@ -447,7 +447,7 @@ Access Develocity via the browser at: ${GREEN}http://${hostname}${NOFORMAT} If you have any questions or need any assistance contact the Develocity support team or your customer success representative. - The installation script created a pre-configured setting.gradle.kts file for you. + The installation script created a pre-configured settings.gradle.kts file for you. """ @@ -461,7 +461,7 @@ Access Develocity via the browser at: ${GREEN}http://${hostname}${NOFORMAT} while :; do case "${1-}" in -h | --help) usage ;; - -v | --version) echo "$Script_Version"; exit 0 ;; + -v | --version) echo "$SCRIPT_VERSION"; exit 0 ;; --no-color) NO_COLOR=1 ;; -l | --license) if [[ -f "${2-}" ]]; then From c76d602c01f8c73736e8cb39812ba9c89ba08826 Mon Sep 17 00:00:00 2001 From: Piotr Kolacz Date: Tue, 23 Jun 2026 12:38:43 +0200 Subject: [PATCH 2/9] chore: regenerate ec2-install.sh.sha256 for the updated script The Generate SHA256 Checksum workflow did not run on the PR, so update the checksum manually to keep it in sync with the script. --- AWS/EC2/ec2-install.sh.sha256 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AWS/EC2/ec2-install.sh.sha256 b/AWS/EC2/ec2-install.sh.sha256 index d614366..1764e64 100644 --- a/AWS/EC2/ec2-install.sh.sha256 +++ b/AWS/EC2/ec2-install.sh.sha256 @@ -1 +1 @@ -f5c1792c85af20907bd02dd03101dc66b54623f7717138af27ed97b9266462f3 ec2-install.sh +5b9be33e73eadfb262ecfc7e0362f90db2a9c4c1c814ff01bdf15eef2b6d96e6 ec2-install.sh From d4250101d2a832205286de46f7c26af201946357 Mon Sep 17 00:00:00 2001 From: Piotr Kolacz Date: Tue, 23 Jun 2026 13:32:28 +0200 Subject: [PATCH 3/9] ci: fix the checksum workflow to auto-commit on PR The Generate SHA256 Checksum workflow was not updating the checksum on PRs. Fix it so it regenerates and commits ec2-install.sh.sha256 onto the PR branch whenever the script changes: - Add `permissions: contents: write` so the workflow can push. - Check out the PR head branch (`ref: github.head_ref`) instead of the detached merge ref, so the commit can be pushed back to the PR. - Generate the checksum from inside AWS/EC2 so the file records the bare `ec2-install.sh` name (the guide runs `sha256sum -c` from the working dir; a path-qualified entry would fail validation). - Only commit when the checksum actually changed, to avoid failing on a no-op. --- ...enerate-ec2-quickstart-sha256-checksum.yml | 44 ++++++++++++------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/.github/workflows/generate-ec2-quickstart-sha256-checksum.yml b/.github/workflows/generate-ec2-quickstart-sha256-checksum.yml index a6a13eb..2074578 100644 --- a/.github/workflows/generate-ec2-quickstart-sha256-checksum.yml +++ b/.github/workflows/generate-ec2-quickstart-sha256-checksum.yml @@ -3,32 +3,42 @@ name: Generate SHA256 Checksum on: pull_request: paths: - - 'AWS/EC2/ec2-install.sh' # Trigger only when the install.sh file in the AWS/EC2 directory is changed + - 'AWS/EC2/ec2-install.sh' # Trigger only when the install script in AWS/EC2 is changed types: - opened - synchronize - reopened +# Needed so the workflow can push the regenerated checksum back onto the PR branch. +permissions: + contents: write + jobs: generate-checksum: runs-on: ubuntu-latest steps: - - name: Checkout code - uses: actions/checkout@v7 - - - name: Generate SHA256 checksum for install.sh in AWS/EC2 directory - run: | - # Generate SHA256 checksum for the install.sh script located in AWS/EC2 - sha256sum AWS/EC2/ec2-install.sh > AWS/EC2/ec2-install.sh.sha256 + - name: Checkout the PR branch + uses: actions/checkout@v7 + with: + # Check out the actual PR branch (not the detached merge ref) so we can commit back to it. + ref: ${{ github.head_ref }} - - name: Commit SHA256 file to AWS/EC2 directory - run: | - # Set up Git config - git config --global user.name 'github-actions' - git config --global user.email 'github-actions@github.com' + - name: Generate SHA256 checksum for ec2-install.sh + # Run inside AWS/EC2 so the checksum file records the bare "ec2-install.sh" name. + # The quickstart guide downloads the script to the working directory and runs + # `sha256sum -c ec2-install.sh.sha256`, which expects the bare filename, not a path. + working-directory: AWS/EC2 + run: sha256sum ec2-install.sh > ec2-install.sh.sha256 - # Add the generated checksum file in the AWS/EC2 directory - git add AWS/EC2/ec2-install.sh.sha256 - git commit -m "Add SHA256 checksum for ec2-install.sh in AWS/EC2 directory" - git push + - name: Commit the checksum if it changed + run: | + git config user.name 'github-actions[bot]' + git config user.email '41898282+github-actions[bot]@users.noreply.github.com' + if git diff --quiet -- AWS/EC2/ec2-install.sh.sha256; then + echo "Checksum already up to date; nothing to commit." + else + git add AWS/EC2/ec2-install.sh.sha256 + git commit -m "chore: update ec2-install.sh.sha256 [skip ci]" + git push + fi From 11bbc018bf7831aedb41992415ac536d39c0ec2c Mon Sep 17 00:00:00 2001 From: Piotr Kolacz Date: Tue, 23 Jun 2026 13:40:56 +0200 Subject: [PATCH 4/9] feat: install Helm 4 via get-helm-4 Validated end to end: get-helm-4 installs Helm 4.2.2 and the Develocity standalone chart deploys cleanly (10/10 pods ready, /ping UP). Helm 4 is within Develocity's supported range. Regenerate the checksum to match the new script. --- AWS/EC2/ec2-install.sh | 2 +- AWS/EC2/ec2-install.sh.sha256 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/AWS/EC2/ec2-install.sh b/AWS/EC2/ec2-install.sh index b732657..f43a5ad 100644 --- a/AWS/EC2/ec2-install.sh +++ b/AWS/EC2/ec2-install.sh @@ -231,7 +231,7 @@ installHelm(){ return fi - local url="https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3" + local url="https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-4" checkUrl "${url}" logInfo "Installing Helm..." diff --git a/AWS/EC2/ec2-install.sh.sha256 b/AWS/EC2/ec2-install.sh.sha256 index 1764e64..6009f56 100644 --- a/AWS/EC2/ec2-install.sh.sha256 +++ b/AWS/EC2/ec2-install.sh.sha256 @@ -1 +1 @@ -5b9be33e73eadfb262ecfc7e0362f90db2a9c4c1c814ff01bdf15eef2b6d96e6 ec2-install.sh +00c7d828d23d978a496d77ccf79b4cdea56214ae13321644cbed35c7b4648d87 ec2-install.sh From 36c4610922cc958396b01be10d810f2b4112cbd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Ko=C5=82acz?= Date: Tue, 23 Jun 2026 16:47:18 +0200 Subject: [PATCH 5/9] Apply suggestion from @pio-kol --- AWS/EC2/ec2-install.sh.sha256 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AWS/EC2/ec2-install.sh.sha256 b/AWS/EC2/ec2-install.sh.sha256 index 5b7cff2..d67b8d3 100644 --- a/AWS/EC2/ec2-install.sh.sha256 +++ b/AWS/EC2/ec2-install.sh.sha256 @@ -1 +1 @@ -3fb3a529802fffd779029c08903d449a47d17aef0ea1761940d9d5736955ef94 ec2-install.sh +3fb3a529802fffd779029c08903d449a47d17aef0ea1761940d9d5736955test ec2-install.sh From f4a092706e9f67d04c0048b6a985e6a06cbab78a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 23 Jun 2026 14:47:31 +0000 Subject: [PATCH 6/9] chore: update ec2-install.sh.sha256 [skip ci] --- AWS/EC2/ec2-install.sh.sha256 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AWS/EC2/ec2-install.sh.sha256 b/AWS/EC2/ec2-install.sh.sha256 index d67b8d3..5b7cff2 100644 --- a/AWS/EC2/ec2-install.sh.sha256 +++ b/AWS/EC2/ec2-install.sh.sha256 @@ -1 +1 @@ -3fb3a529802fffd779029c08903d449a47d17aef0ea1761940d9d5736955test ec2-install.sh +3fb3a529802fffd779029c08903d449a47d17aef0ea1761940d9d5736955ef94 ec2-install.sh From 7df7dbd524f57af03dd9455f297d816e5d859cd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Ko=C5=82acz?= Date: Tue, 23 Jun 2026 16:50:23 +0200 Subject: [PATCH 7/9] Apply suggestion from @pio-kol --- .github/workflows/generate-ec2-quickstart-sha256-checksum.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/generate-ec2-quickstart-sha256-checksum.yml b/.github/workflows/generate-ec2-quickstart-sha256-checksum.yml index 2074578..2129426 100644 --- a/.github/workflows/generate-ec2-quickstart-sha256-checksum.yml +++ b/.github/workflows/generate-ec2-quickstart-sha256-checksum.yml @@ -3,7 +3,7 @@ name: Generate SHA256 Checksum on: pull_request: paths: - - 'AWS/EC2/ec2-install.sh' # Trigger only when the install script in AWS/EC2 is changed + - 'AWS/EC2' types: - opened - synchronize From a7017b8f29ec454aa1b044a376da4d62ded22f52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Ko=C5=82acz?= Date: Tue, 23 Jun 2026 16:52:35 +0200 Subject: [PATCH 8/9] Apply suggestion from @pio-kol --- AWS/EC2/ec2-install.sh.sha256 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AWS/EC2/ec2-install.sh.sha256 b/AWS/EC2/ec2-install.sh.sha256 index 5b7cff2..d67b8d3 100644 --- a/AWS/EC2/ec2-install.sh.sha256 +++ b/AWS/EC2/ec2-install.sh.sha256 @@ -1 +1 @@ -3fb3a529802fffd779029c08903d449a47d17aef0ea1761940d9d5736955ef94 ec2-install.sh +3fb3a529802fffd779029c08903d449a47d17aef0ea1761940d9d5736955test ec2-install.sh From 51bf5fb785ac3161e793ac9d75cde86f7b8d3d86 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 23 Jun 2026 14:55:38 +0000 Subject: [PATCH 9/9] chore: update ec2-install.sh.sha256 [skip ci] --- AWS/EC2/ec2-install.sh.sha256 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AWS/EC2/ec2-install.sh.sha256 b/AWS/EC2/ec2-install.sh.sha256 index d67b8d3..5b7cff2 100644 --- a/AWS/EC2/ec2-install.sh.sha256 +++ b/AWS/EC2/ec2-install.sh.sha256 @@ -1 +1 @@ -3fb3a529802fffd779029c08903d449a47d17aef0ea1761940d9d5736955test ec2-install.sh +3fb3a529802fffd779029c08903d449a47d17aef0ea1761940d9d5736955ef94 ec2-install.sh