env/corellium: update Corellium builder setup scripts
Corellium recently wiped the existing virtual iPhone and Android
builders because of a cloud provider switch. This change reflects
the updates to the setup scripts matching newer Corellium software.
Bump the expected builders numbers to reflect the increased capacity.
Change-Id: I93196dd22b81e66cb2cad82b1ef3dcff64e852d8
Reviewed-on: https://go-review.googlesource.com/c/build/+/266377
Run-TryBot: Elias Naur <mail@eliasnaur.com>
Run-TryBot: Dmitri Shuralyov <dmitshur@golang.org>
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
TryBot-Result: Go Bot <gobot@golang.org>
Trust: Elias Naur <mail@eliasnaur.com>
diff --git a/dashboard/builders.go b/dashboard/builders.go
index 766fb9a..679fbb1 100644
--- a/dashboard/builders.go
+++ b/dashboard/builders.go
@@ -576,7 +576,7 @@
Notes: "Virtual iOS devices hosted by Zenly on Corellium; see issues 31722 and 40523",
OwnerGithub: "znly",
IsReverse: true,
- ExpectNum: 2,
+ ExpectNum: 3,
env: []string{
"GOROOT_BOOTSTRAP=/var/mobile/go-ios-arm64-bootstrap",
},
@@ -585,7 +585,7 @@
Notes: "Virtual Android devices hosted by Zenly on Corellium; see issues 31722 and 40523",
OwnerGithub: "znly",
IsReverse: true,
- ExpectNum: 2,
+ ExpectNum: 3,
env: []string{
"GOROOT_BOOTSTRAP=/data/data/com.termux/files/home/go-android-arm64-bootstrap",
},
diff --git a/env/corellium/android/install.sh b/env/corellium/android/install.sh
index 74faa60..79c2b05 100755
--- a/env/corellium/android/install.sh
+++ b/env/corellium/android/install.sh
@@ -6,7 +6,7 @@
#
# place a valid builder key in the `buildkey` file.
-curl -o com.termux.apk "https://f-droid.org/repo/com.termux_77.apk"
+curl -o com.termux.apk "https://f-droid.org/repo/com.termux_102.apk"
curl -o com.termux.boot.apk "https://f-droid.org/repo/com.termux.boot_7.apk"
adb install com.termux.apk
@@ -21,7 +21,7 @@
adb root
-# Wait for the Termux filesystem.
+echo "waiting for the Termux filesystem..."
while adb shell ls /data/data/com.termux/files/home 2> /dev/null ; [ $? -ne 0 ]; do
sleep 1
done
diff --git a/env/corellium/ios/files/sources.list b/env/corellium/ios/files/sources.list
deleted file mode 100644
index 735534c..0000000
--- a/env/corellium/ios/files/sources.list
+++ /dev/null
@@ -1,6 +0,0 @@
-deb https://apt.bingner.com/ ios/1570.15 main
-deb http://apt.thebigboss.org/repofiles/cydia/ stable main
-deb http://cydia.zodttd.com/repo/cydia/ stable main
-deb http://apt.modmyi.com/ stable main
-deb https://repo.chariz.io/ ./
-deb https://repo.dynastic.co/ ./
diff --git a/env/corellium/ios/install.sh b/env/corellium/ios/install.sh
index 226789d..ec1501c 100755
--- a/env/corellium/ios/install.sh
+++ b/env/corellium/ios/install.sh
@@ -16,10 +16,6 @@
ssh "$HOST" "$@"
}
-# Replace the builtin packages sources with a list of sources
-# that contain aworking toolchain.
-scp files/sources.list $HOST:/etc/apt/sources.list.d/sources.list
-ios rm /etc/apt/sources.list.d/electra.list
ios apt-get update
ios apt install -y --allow-unauthenticated git tmux rsync org.coolstar.iostoolchain ld64 com.linusyang.localeutf8
