Skip to content

Commit 90d12b2

Browse files
paulparkinsonpaulparkinson
authored
switch to arm for graalvm due to cloudshell change in default (#889)
* bump kubernetes_version to v1.29.1 * switch to arm for graalvm due to cloudshell change in default * switch to arm for graalvm due to cloudshell change in default
1 parent 57fe269 commit 90d12b2

File tree

13 files changed

+38
-34
lines changed

13 files changed

+38
-34
lines changed

‎grabdish/env.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ cd $GRABDISH_HOME
2323
echo "GRABDISH_HOME: $GRABDISH_HOME"
2424

2525
# Java Home
26-
if test -d ~/graalvm-ce-java11-20.1.0/Contents/Home/bin; then
26+
if test -d ~/graalvm-ce-java11-20.2.0/Contents/Home/bin; then
2727
# We are on Mac doing local dev
28-
export JAVA_HOME=~/graalvm-ce-java11-20.1.0/Contents/Home;
28+
export JAVA_HOME=~/graalvm-ce-java11-20.2.0/Contents/Home;
2929
else
3030
# Assume linux
31-
export JAVA_HOME=~/graalvm-ce-java11-20.1.0
31+
export JAVA_HOME=~/graalvm-ce-java11-20.2.0
3232
fi
3333
export PATH=$JAVA_HOME/bin:$PATH
3434

‎grabdish/utils/java-builds.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@ done
1919

2020
# Install Graal
2121
while ! state_done GRAAL; do
22-
if ! test -d ~/graalvm-ce-java11-20.1.0; then
23-
curl -sL https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.1.0/graalvm-ce-java11-linux-amd64-20.1.0.tar.gz | tar xz
24-
mv graalvm-ce-java11-20.1.0 ~/
22+
if ! test -d ~/graalvm-ce-java11-20.2.0; then
23+
curl -sL https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.2.0/graalvm-ce-java11-linux-aarch64-20.2.0.tar.gz | tar xz
24+
mv graalvm-ce-java11-20.2.0 ~/
2525
fi
2626
state_set_done GRAAL
2727
done
2828

2929

3030
# Install GraalVM native-image...
3131
while ! state_done GRAAL_IMAGE; do
32-
~/graalvm-ce-java11-20.1.0/bin/gu install native-image
32+
~/graalvm-ce-java11-20.2.0/bin/gu install native-image
3333
state_set_done GRAAL_IMAGE
3434
done
3535

‎infra/java/GraalVM/apply.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,22 @@ fi
1212

1313

1414
# Install Graal
15-
if ! test -d ~/graalvm-ce-java11-20.1.0; then
15+
if ! test -d ~/graalvm-ce-java11-20.2.0; then
1616
cd $MY_STATE
1717
OS_NAME=`uname`
1818
curl -sL https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.1.0/graalvm-ce-java11-${OS_NAME}-amd64-20.1.0.tar.gz | tar xz
19-
mv graalvm-ce-java11-20.1.0 ~/
19+
mv graalvm-ce-java11-20.2.0 ~/
2020
fi
2121

2222
# Java Home
23-
if test -d ~/graalvm-ce-java11-20.1.0/Contents/Home/bin; then
23+
if test -d ~/graalvm-ce-java11-20.2.0/Contents/Home/bin; then
2424
# We are on Mac doing local dev
25-
~/graalvm-ce-java11-20.1.0/Contents/Home/bin/gu install native-image
26-
JAVA_HOME=~/graalvm-ce-java11-20.1.0/Contents/Home;
25+
~/graalvm-ce-java11-20.2.0/Contents/Home/bin/gu install native-image
26+
JAVA_HOME=~/graalvm-ce-java11-20.2.0/Contents/Home;
2727
else
2828
# Assume linux
29-
~/graalvm-ce-java11-20.1.0/bin/gu install native-image
30-
JAVA_HOME=~/graalvm-ce-java11-20.1.0
29+
~/graalvm-ce-java11-20.2.0/bin/gu install native-image
30+
JAVA_HOME=~/graalvm-ce-java11-20.2.0
3131
fi
3232

3333

‎infra/java/GraalVM/destroy.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ fi
1212

1313

1414
# Install Graal
15-
if test -d ~/graalvm-ce-java11-20.1.0; then
16-
rm -rf ~/graalvm-ce-java11-20.1.0
15+
if test -d ~/graalvm-ce-java11-20.2.0; then
16+
rm -rf ~/graalvm-ce-java11-20.2.0
1717
fi
1818

1919

‎infra/oci-iaas/resource_manager/multi-node-deployment/modules/compute/scripts/bootstap06.17.21.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ sudo rpm -i https://yum.oracle.com/repo/OracleLinux/OL8/oracle/instantclient/x86
8686
sudo rpm -i https://yum.oracle.com/repo/OracleLinux/OL8/oracle/instantclient/x86_64/getPackage/oracle-instantclient19.11-sqlplus-19.11.0.0.0-1.x86_64.rpm
8787
sudo rpm -i https://yum.oracle.com/repo/OracleLinux/OL8/oracle/instantclient/x86_64/getPackage/oracle-instantclient19.11-tools-19.11.0.0.0-1.x86_64.rpm
8888

89-
curl -sL https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.1.0/graalvm-ce-java11-linux-amd64-20.1.0.tar.gz | tar xz
90-
~/graalvm-ce-java11-20.1.0/bin/gu install native-image
89+
curl -sL https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.2.0/graalvm-ce-java11-linux-aarch64-20.2.0.tar.gz | tar xz
90+
~/graalvm-ce-java11-20.2.0/bin/gu install native-image
9191

9292

9393
#Post Provisioning

‎infra/oci-iaas/resource_manager/multi-node-deployment/modules/compute/scripts/create_custom_image.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,10 @@ sudo rpm -i https://yum.oracle.com/repo/OracleLinux/OL8/oracle/instantclient/x86
2626
sudo rpm -i https://yum.oracle.com/repo/OracleLinux/OL8/oracle/instantclient/x86_64/getPackage/oracle-instantclient19.11-sqlplus-19.11.0.0.0-1.x86_64.rpm
2727
sudo rpm -i https://yum.oracle.com/repo/OracleLinux/OL8/oracle/instantclient/x86_64/getPackage/oracle-instantclient19.11-tools-19.11.0.0.0-1.x86_64.rpm
2828

29-
curl -sL https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.1.0/graalvm-ce-java11-linux-amd64-20.1.0.tar.gz | tar xz
30-
~/graalvm-ce-java11-20.1.0/bin/gu install native-image
29+
curl -sL https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.2.0/graalvm-ce-java11-linux-aarch64-20.2.0.tar.gz | tar xz
30+
~/graalvm-ce-java11-20.2.0/bin/gu install native-image
31+
32+
curl -sL https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-22.0.1/graalvm-community-jdk-22.0.1_linux-x64_bin.tar.gz | tar xz
33+
~/graalvm-community-jdk-22.0.1/bin/gu install native-image
3134

3235
#kubcetl, minikube, docker, docker registry

‎infra/oci-iaas/resource_manager/multnodes-deployment/modules/compute/scripts/bootstap06.17.21.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ sudo rpm -i https://yum.oracle.com/repo/OracleLinux/OL8/oracle/instantclient/x86
8585
sudo rpm -i https://yum.oracle.com/repo/OracleLinux/OL8/oracle/instantclient/x86_64/getPackage/oracle-instantclient19.11-sqlplus-19.11.0.0.0-1.x86_64.rpm
8686
sudo rpm -i https://yum.oracle.com/repo/OracleLinux/OL8/oracle/instantclient/x86_64/getPackage/oracle-instantclient19.11-tools-19.11.0.0.0-1.x86_64.rpm
8787

88-
curl -sL https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.1.0/graalvm-ce-java11-linux-amd64-20.1.0.tar.gz | tar xz
89-
~/graalvm-ce-java11-20.1.0/bin/gu install native-image
88+
curl -sL https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.2.0/graalvm-ce-java11-linux-aarch64-20.2.0.tar.gz | tar xz
89+
~/graalvm-ce-java11-20.2.0/bin/gu install native-image
9090

9191

9292
#Post Provisioning

‎infra/oci-iaas/resource_manager/multnodes-deployment/modules/compute/scripts/create_custom_image.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ sudo rpm -i https://yum.oracle.com/repo/OracleLinux/OL8/oracle/instantclient/x86
2626
sudo rpm -i https://yum.oracle.com/repo/OracleLinux/OL8/oracle/instantclient/x86_64/getPackage/oracle-instantclient19.11-sqlplus-19.11.0.0.0-1.x86_64.rpm
2727
sudo rpm -i https://yum.oracle.com/repo/OracleLinux/OL8/oracle/instantclient/x86_64/getPackage/oracle-instantclient19.11-tools-19.11.0.0.0-1.x86_64.rpm
2828

29-
curl -sL https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.1.0/graalvm-ce-java11-linux-amd64-20.1.0.tar.gz | tar xz
30-
~/graalvm-ce-java11-20.1.0/bin/gu install native-image
29+
curl -sL https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.2.0/graalvm-ce-java11-linux-aarch64-20.2.0.tar.gz | tar xz
30+
~/graalvm-ce-java11-20.2.0/bin/gu install native-image
3131

3232
#kubcetl, minikube, docker, docker registry

‎infra/oci-iaas/resource_manager/single-node-deployment/modules/compute/scripts/bootstap06.17.21.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ sudo rpm -i https://yum.oracle.com/repo/OracleLinux/OL8/oracle/instantclient/x86
8686
sudo rpm -i https://yum.oracle.com/repo/OracleLinux/OL8/oracle/instantclient/x86_64/getPackage/oracle-instantclient19.11-sqlplus-19.11.0.0.0-1.x86_64.rpm
8787
sudo rpm -i https://yum.oracle.com/repo/OracleLinux/OL8/oracle/instantclient/x86_64/getPackage/oracle-instantclient19.11-tools-19.11.0.0.0-1.x86_64.rpm
8888

89-
curl -sL https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.1.0/graalvm-ce-java11-linux-amd64-20.1.0.tar.gz | tar xz
90-
~/graalvm-ce-java11-20.1.0/bin/gu install native-image
89+
curl -sL https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.2.0/graalvm-ce-java11-linux-aarch64-20.2.0.tar.gz | tar xz
90+
~/graalvm-ce-java11-20.2.0/bin/gu install native-image
9191

9292

9393
#Post Provisioning

‎infra/oci-iaas/resource_manager/single-node-deployment/modules/compute/scripts/create_custom_image.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ sudo rpm -i https://yum.oracle.com/repo/OracleLinux/OL8/oracle/instantclient/x86
2626
sudo rpm -i https://yum.oracle.com/repo/OracleLinux/OL8/oracle/instantclient/x86_64/getPackage/oracle-instantclient19.11-sqlplus-19.11.0.0.0-1.x86_64.rpm
2727
sudo rpm -i https://yum.oracle.com/repo/OracleLinux/OL8/oracle/instantclient/x86_64/getPackage/oracle-instantclient19.11-tools-19.11.0.0.0-1.x86_64.rpm
2828

29-
curl -sL https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.1.0/graalvm-ce-java11-linux-amd64-20.1.0.tar.gz | tar xz
30-
~/graalvm-ce-java11-20.1.0/bin/gu install native-image
29+
curl -sL https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.2.0/graalvm-ce-java11-linux-aarch64-20.2.0.tar.gz | tar xz
30+
~/graalvm-ce-java11-20.2.0/bin/gu install native-image
3131

3232
#kubcetl, minikube, docker, docker registry

0 commit comments

Comments
 (0)