Skip to content

Commit 5ceaa13

Browse files
aslushnikovaslushnikov
committed
devops: normalize blob names on the CDN
This establishes a single naming for all our blobs with browser builds that we upload to CDN: `<browser-name>-<os-version>` - `<browser-name>` is either `firefox` or `webkit`. - `os-version` is the OS that was used to produce the build. References microsoft#2745
1 parent bbe7dbe commit 5ceaa13

File tree

6 files changed

+31
-31
lines changed

6 files changed

+31
-31
lines changed

‎browser_patches/buildbots/buildbot-mac-10.14.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ if [[ -n $(git status -s) ]]; then
6161
fi
6262

6363
git pull origin master
64-
../checkout_build_archive_upload.sh firefox-mac >/tmp/$(basename $0)--firefox-mac.log || true
64+
../checkout_build_archive_upload.sh firefox-mac-10.14 >/tmp/$(basename $0)--firefox-mac.log || true
6565

6666
git pull origin master
6767
../checkout_build_archive_upload.sh webkit-mac-10.14 >/tmp/$(basename $0)--webkit-mac-10.14.log || true

‎browser_patches/checkout_build_archive_upload.sh

+7-7
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ if [[ "$BUILD_FLAVOR" == "firefox-ubuntu-18.04" ]]; then
4141
EXPECTED_HOST_OS="Ubuntu"
4242
EXPECTED_HOST_OS_VERSION="18.04"
4343
BUILD_BLOB_NAME="firefox-ubuntu-18.04.zip"
44-
elif [[ "$BUILD_FLAVOR" == "firefox-mac" ]]; then
44+
elif [[ "$BUILD_FLAVOR" == "firefox-mac-10.14" ]]; then
4545
BROWSER_NAME="firefox"
4646
EXPECTED_HOST_OS="Darwin"
4747
EXPECTED_HOST_OS_VERSION="10.14"
48-
BUILD_BLOB_NAME="firefox-mac.zip"
48+
BUILD_BLOB_NAME="firefox-mac-10.14.zip"
4949
elif [[ "$BUILD_FLAVOR" == "firefox-win32" ]]; then
5050
BROWSER_NAME="firefox"
5151
EXPECTED_HOST_OS="MINGW"
@@ -59,26 +59,26 @@ elif [[ "$BUILD_FLAVOR" == "webkit-ubuntu-18.04" ]]; then
5959
BROWSER_NAME="webkit"
6060
EXPECTED_HOST_OS="Ubuntu"
6161
EXPECTED_HOST_OS_VERSION="18.04"
62-
BUILD_BLOB_NAME="minibrowser-gtk-wpe-ubuntu-18.04.zip"
62+
BUILD_BLOB_NAME="webkit-ubuntu-18.04.zip"
6363
elif [[ "$BUILD_FLAVOR" == "webkit-ubuntu-20.04" ]]; then
6464
BROWSER_NAME="webkit"
6565
EXPECTED_HOST_OS="Ubuntu"
6666
EXPECTED_HOST_OS_VERSION="20.04"
67-
BUILD_BLOB_NAME="minibrowser-gtk-wpe-ubuntu-20.04.zip"
67+
BUILD_BLOB_NAME="webkit-ubuntu-20.04.zip"
6868
elif [[ "$BUILD_FLAVOR" == "webkit-win64" ]]; then
6969
BROWSER_NAME="webkit"
7070
EXPECTED_HOST_OS="MINGW"
71-
BUILD_BLOB_NAME="minibrowser-win64.zip"
71+
BUILD_BLOB_NAME="webkit-win64.zip"
7272
elif [[ "$BUILD_FLAVOR" == "webkit-mac-10.14" ]]; then
7373
BROWSER_NAME="webkit"
7474
EXPECTED_HOST_OS="Darwin"
7575
EXPECTED_HOST_OS_VERSION="10.14"
76-
BUILD_BLOB_NAME="minibrowser-mac-10.14.zip"
76+
BUILD_BLOB_NAME="webkit-mac-10.14.zip"
7777
elif [[ "$BUILD_FLAVOR" == "webkit-mac-10.15" ]]; then
7878
BROWSER_NAME="webkit"
7979
EXPECTED_HOST_OS="Darwin"
8080
EXPECTED_HOST_OS_VERSION="10.15"
81-
BUILD_BLOB_NAME="minibrowser-mac-10.15.zip"
81+
BUILD_BLOB_NAME="webkit-mac-10.15.zip"
8282
else
8383
echo ERROR: unknown build flavor - "$BUILD_FLAVOR"
8484
exit 1

‎browser_patches/firefox/BUILD_NUMBER

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
1139
2-
Changed: [email protected] Thu Jul 23 09:56:07 PDT 2020
1+
1140
2+
Changed: [email protected] Thu Jul 23 17:44:30 PDT 2020

‎browser_patches/tools/check_cdn.sh

+6-6
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ HOST="https://playwright2.blob.core.windows.net/builds"
2323

2424
FFOX_REVISION=$(head -1 ../firefox/BUILD_NUMBER)
2525
FFOX_ARCHIVES=(
26-
"$HOST/firefox/%s/firefox-mac.zip"
26+
"$HOST/firefox/%s/firefox-mac-10.14.zip"
2727
"$HOST/firefox/%s/firefox-ubuntu-18.04.zip"
2828
"$HOST/firefox/%s/firefox-win32.zip"
2929
"$HOST/firefox/%s/firefox-win64.zip"
@@ -37,11 +37,11 @@ FFOX_ALIASES=(
3737

3838
WK_REVISION=$(head -1 ../webkit/BUILD_NUMBER)
3939
WK_ARCHIVES=(
40-
"$HOST/webkit/%s/minibrowser-gtk-wpe-ubuntu-18.04.zip"
41-
"$HOST/webkit/%s/minibrowser-gtk-wpe-ubuntu-20.04.zip"
42-
"$HOST/webkit/%s/minibrowser-mac-10.14.zip"
43-
"$HOST/webkit/%s/minibrowser-mac-10.15.zip"
44-
"$HOST/webkit/%s/minibrowser-win64.zip"
40+
"$HOST/webkit/%s/webkit-ubuntu-18.04.zip"
41+
"$HOST/webkit/%s/webkit-ubuntu-20.04.zip"
42+
"$HOST/webkit/%s/webkit-mac-10.14.zip"
43+
"$HOST/webkit/%s/webkit-mac-10.15.zip"
44+
"$HOST/webkit/%s/webkit-win64.zip"
4545
)
4646
WK_ALIASES=(
4747
"WK-UBUNTU-18.04"

‎browser_patches/webkit/BUILD_NUMBER

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
1316
2-
Changed: yurys@chromium.org Thu Jul 23 16:12:30 PDT 2020
1+
1317
2+
Changed: lushnikov@chromium.org Thu Jul 23 17:44:30 PDT 2020

‎src/install/browserFetcher.ts

+13-13
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ function getDownloadUrl(browserName: BrowserName, revision: number, platform: Br
6969
}
7070

7171
if (browserName === 'firefox') {
72-
const FIREFOX_RENAME_LINUX_TO_UBUNTU_REVISION = 1139;
73-
return revision < FIREFOX_RENAME_LINUX_TO_UBUNTU_REVISION ?
72+
const FIREFOX_NORMALIZE_CDN_NAMES_REVISION = 1140;
73+
return revision < FIREFOX_NORMALIZE_CDN_NAMES_REVISION ?
7474
new Map<BrowserPlatform, string>([
7575
['ubuntu18.04', '%s/builds/firefox/%s/firefox-linux.zip'],
7676
['ubuntu20.04', '%s/builds/firefox/%s/firefox-linux.zip'],
@@ -83,17 +83,17 @@ function getDownloadUrl(browserName: BrowserName, revision: number, platform: Br
8383
new Map<BrowserPlatform, string>([
8484
['ubuntu18.04', '%s/builds/firefox/%s/firefox-ubuntu-18.04.zip'],
8585
['ubuntu20.04', '%s/builds/firefox/%s/firefox-ubuntu-18.04.zip'],
86-
['mac10.13', '%s/builds/firefox/%s/firefox-mac.zip'],
87-
['mac10.14', '%s/builds/firefox/%s/firefox-mac.zip'],
88-
['mac10.15', '%s/builds/firefox/%s/firefox-mac.zip'],
86+
['mac10.13', '%s/builds/firefox/%s/firefox-mac-10.14.zip'],
87+
['mac10.14', '%s/builds/firefox/%s/firefox-mac-10.14.zip'],
88+
['mac10.15', '%s/builds/firefox/%s/firefox-mac-10.14.zip'],
8989
['win32', '%s/builds/firefox/%s/firefox-win32.zip'],
9090
['win64', '%s/builds/firefox/%s/firefox-win64.zip'],
9191
]).get(platform);
9292
}
9393

9494
if (browserName === 'webkit') {
95-
const WEBKIT_RENAME_LINUX_TO_UBUNTU_REVISION = 1315;
96-
return revision < WEBKIT_RENAME_LINUX_TO_UBUNTU_REVISION ?
95+
const WEBKIT_NORMALIZE_CDN_NAMES_REVISION = 1317;
96+
return revision < WEBKIT_NORMALIZE_CDN_NAMES_REVISION ?
9797
new Map<BrowserPlatform, string | undefined>([
9898
['ubuntu18.04', '%s/builds/webkit/%s/minibrowser-gtk-wpe.zip'],
9999
['ubuntu20.04', '%s/builds/webkit/%s/minibrowser-gtk-wpe.zip'],
@@ -104,13 +104,13 @@ function getDownloadUrl(browserName: BrowserName, revision: number, platform: Br
104104
['win64', '%s/builds/webkit/%s/minibrowser-win64.zip'],
105105
]).get(platform) :
106106
new Map<BrowserPlatform, string | undefined>([
107-
['ubuntu18.04', '%s/builds/webkit/%s/minibrowser-gtk-wpe-ubuntu-18.04.zip'],
108-
['ubuntu20.04', '%s/builds/webkit/%s/minibrowser-gtk-wpe-ubuntu-20.04.zip'],
107+
['ubuntu18.04', '%s/builds/webkit/%s/webkit-ubuntu-18.04.zip'],
108+
['ubuntu20.04', '%s/builds/webkit/%s/webkit-ubuntu-20.04.zip'],
109109
['mac10.13', undefined],
110-
['mac10.14', '%s/builds/webkit/%s/minibrowser-mac-10.14.zip'],
111-
['mac10.15', '%s/builds/webkit/%s/minibrowser-mac-10.15.zip'],
112-
['win32', '%s/builds/webkit/%s/minibrowser-win64.zip'],
113-
['win64', '%s/builds/webkit/%s/minibrowser-win64.zip'],
110+
['mac10.14', '%s/builds/webkit/%s/webkit-mac-10.14.zip'],
111+
['mac10.15', '%s/builds/webkit/%s/webkit-mac-10.15.zip'],
112+
['win32', '%s/builds/webkit/%s/webkit-win64.zip'],
113+
['win64', '%s/builds/webkit/%s/webkit-win64.zip'],
114114
]).get(platform);
115115
}
116116
}

0 commit comments

Comments
 (0)