Add more fixes

Signed-off-by: Peter Zhu <[email protected]>
peterzhuamazon · Jul 8, 2024 · d9d76e2 · d9d76e2
1 parent cc9179d
commit d9d76e2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 26 deletions.
diff --git a/packer/jenkins-agent-macos13-arm64.json b/packer/jenkins-agent-macos13-arm64.json
@@ -64,13 +64,6 @@
     }
   ],
   "provisioners": [
-    {
-      "type": "shell",
-      "scripts": [
-        "scripts/macos/macos-disk-resize.sh"
-      ],
-      "max_retries": 3
-    },
     {
       "type": "shell",
       "inline": [

diff --git a/packer/jenkins-agent-macos13-x64.json b/packer/jenkins-agent-macos13-x64.json
@@ -64,13 +64,6 @@
     }
   ],
   "provisioners": [
-    {
-      "type": "shell",
-      "scripts": [
-        "scripts/macos/macos-disk-resize.sh"
-      ],
-      "max_retries": 3
-    },
     {
       "type": "shell",
       "inline": [

diff --git a/packer/scripts/macos/macos-agentsetup.sh b/packer/scripts/macos/macos-agentsetup.sh
@@ -7,11 +7,11 @@ sudo chown -R ec2-user:staff /var/jenkins
 ## Array of JDK versions in form of version@URL@priority
 jdk_versions=(
     "8@https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jdk_x64_mac_hotspot_8u412b08.tar.gz@1"
-    "11@https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jdk_x64_mac_hotspot_11.0.23_9.tar.gz@100"
+    "11@https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jdk_x64_mac_hotspot_11.0.23_9.tar.gz@1"
     "17@https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jdk_x64_mac_hotspot_17.0.11_9.tar.gz@1"
     "19@https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jdk_x64_mac_hotspot_19.0.2_7.tar.gz@1"
     "20@https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.2%2B9/OpenJDK20U-jdk_x64_mac_hotspot_20.0.2_9.tar.gz@1"
-    "21@https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jdk_x64_mac_hotspot_21.0.1_12.tar.gz@1"
+    "21@https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jdk_x64_mac_hotspot_21.0.1_12.tar.gz@100"
 )
 
 ## Setup brew Defaults
@@ -25,11 +25,11 @@ if [ "$ARCH" = "arm64" ]; then
         # https://github.com/adoptium/adoptium/issues/96
         # We can also use rosetta but a bit slower so default to Oracle HotSpot for now
         "8@https://ci.opensearch.org/ci/dbc/tools/jdk-8u411-macosx-aarch64.tar.gz@1"
-        "11@https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jdk_aarch64_mac_hotspot_11.0.23_9.tar.gz@100"
+        "11@https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jdk_aarch64_mac_hotspot_11.0.23_9.tar.gz@1"
         "17@https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.11_9.tar.gz@1"
         "19@https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jdk_aarch64_mac_hotspot_19.0.2_7.tar.gz@1"
         "20@https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.2%2B9/OpenJDK20U-jdk_aarch64_mac_hotspot_20.0.2_9.tar.gz@1"
-        "21@https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jdk_aarch64_mac_hotspot_21.0.3_9.tar.gz@1"
+        "21@https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jdk_aarch64_mac_hotspot_21.0.3_9.tar.gz@100"
     )
 fi
 $BREW_PATH/brew update --preinstall
@@ -42,6 +42,7 @@ $BREW_PATH/brew install wget
 $BREW_PATH/brew install maven
 $BREW_PATH/brew install dpkg
 $BREW_PATH/brew install ca-certificates
+$BREW_PATH/brew cleanup
 
 
 ## Loop through JDK versions and install them
@@ -50,18 +51,18 @@ for version_info in "${jdk_versions[@]}"; do
     version_url=$(echo "$version_info" | cut -d '@' -f 2)
     version_priority=$(echo "$version_info" | cut -d '@' -f 3)
     sudo mkdir -p "/opt/java/openjdk-${version_num}/"
-    $BREW_PATH/wget "$version_url" -O "openjdk-${version_num}.tar.gz"
+    /usr/local/bin/wget -nv "$version_url" -O "openjdk-${version_num}.tar.gz"
     sudo tar -xzf "openjdk-${version_num}.tar.gz" -C "/opt/java/openjdk-${version_num}/" --strip-components=1
-    $BREW_PATH/update-alternatives --install /usr/local/bin/java java "/opt/java/openjdk-${version_num}/Contents/Home/bin/java" ${version_priority}
+    /usr/local/bin/update-alternatives --install /usr/local/bin/java java "/opt/java/openjdk-${version_num}/Contents/Home/bin/java" ${version_priority}
 done
 
 ## Set default Java to 21
-$BREW_PATH/update-alternatives --set java `$BREW_PATH/update-alternatives --list java | grep openjdk-21`
+/usr/local/bin/update-alternatives --set java `/usr/local/bin/update-alternatives --list java | grep openjdk-21`
 
 ## Install MacPorts and python39
-rm -rf /opt/local/etc/macports /opt/local/var/macports
-$BREW_PATH/wget https://github.com/macports/macports-base/releases/download/v2.9.3/MacPorts-2.9.3.tar.gz
-tar -xvf MacPorts-2.9.3.tar.gz
+sudo rm -rf /opt/local/etc/macports /opt/local/var/macports
+/usr/local/bin/wget -nv https://github.com/macports/macports-base/releases/download/v2.9.3/MacPorts-2.9.3.tar.gz
+tar -xzf MacPorts-2.9.3.tar.gz
 cd MacPorts-2.9.3
 ./configure && make && sudo make install
 cd .. && rm -rf MacPorts-2.9.3.tar.gz
@@ -72,9 +73,9 @@ sudo port select --set python python39
 sudo port select --set python3 python39
 
 ## Install pip and pip packages
-$BREW_PATH/wget https://bootstrap.pypa.io/get-pip.py
+/usr/local/bin/wget -nv https://bootstrap.pypa.io/get-pip.py
 python3 get-pip.py
 export PATH=/Users/ec2-user/Library/Python/3.9/bin:/opt/local/Library/Frameworks/Python.framework/Versions/3.9/bin:$PATH
 pip install pipenv==2023.6.12
 pip install awscli==1.32.17
-pip install cmake==3.23.3
+pip install cmake==3.26.4