Skip to content

Commit 07af6aa

Browse files
authored
Merge pull request #4 from gradle/sven/update-2025.1.1
refactor(): remove elements to simplify maintenance
2 parents 81011d2 + 4c2757b commit 07af6aa

File tree

2 files changed

+2
-23
lines changed

2 files changed

+2
-23
lines changed

AWS/EC2/ec2-install.sh

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,8 @@ set -e
1616
trap cleanup SIGINT SIGTERM ERR EXIT
1717

1818
# --- Variables ---
19-
INSTALL_K3S_VERSION=${INSTALL_K3S_VERSION:-"v1.32.3+k3s1"}
2019
DV_CHART_REGISTRY_URL=${DV_CHART_REGISTRY_URL:-"https://helm.gradle.com/"}
21-
DV_VERSION=${DV_VERSION:-"2025.1.0"}
22-
Script_Version="0.1"
20+
SCRIPT_VERSION="0.1"
2321

2422
# Log File
2523
LOGFILE="$(pwd)/install_$(date +'%Y%m%d_%H%M%S').log"
@@ -108,23 +106,6 @@ echo -e "${YELLOW}-u, --uninstall${NOFORMAT} Uninstall Develocity Platform"
108106
exit
109107
}
110108

111-
# --- Validation functions ---
112-
# Check if the script is running as root
113-
# This is not used at the moment.
114-
#validateSudo () {
115-
# local OS_TYPE=$(uname)
116-
# if [ "$OS_TYPE" == "Linux" ] && [ $EUID -ne 0 ]; then
117-
# exitError "This script must be run as root or with sudo."
118-
# elif [ "$OS_TYPE" != "Linux" ]; then
119-
# exitError "This script is only supported on Linux."
120-
# fi
121-
122-
# local ARCHITECTURE=$(uname -m)
123-
# if [ "$ARCHITECTURE" != "x86_64" ]; then
124-
# exitError "This script is only supported on x86_64 architecture."
125-
# fi
126-
#}
127-
128109
# Check if the OS is Linux and x86_64
129110
validateOS () {
130111
local OS_TYPE
@@ -230,7 +211,6 @@ installK3s(){
230211
checkUrl "${baseUrl}"
231212

232213
logInfo "Installing K3s..."
233-
export INSTALL_K3S_VERSION="${INSTALL_K3S_VERSION}"
234214
curl -s -fL ${baseUrl} | sh - || exitError "Failed to install k3s"
235215
}
236216

@@ -270,7 +250,6 @@ installPlatformChart(){
270250
helm repo add gradle "${baseUrl}" && \
271251
helm repo update && \
272252
helm install \
273-
--version "${DV_VERSION}" \
274253
--create-namespace --namespace develocity \
275254
ge-standalone \
276255
gradle/gradle-enterprise-standalone \

AWS/EC2/ec2-install.sh.sha256

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ae5a646c78d3de90c29018b2153a5660d2410a991f724434337902cbcd7f251a ec2-install.sh
1+
e194a237d36b92b90f7661e57fac2047dc74c769a0b4c837002794d24c0645c8 ec2-install.sh

0 commit comments

Comments
 (0)