Skip to content

Commit

Permalink
[GTK] [WPE] Reintroduce Ubuntu 20.04 Nightly Packaging bots
Browse files Browse the repository at this point in the history
https://bugs.webkit.org/show_bug.cgi?id=273940

Reviewed by Carlos Alberto Lopez Perez.

These bots are still needed for wpt.fyi.

* Tools/CISupport/build-webkit-org/config.json:
* Tools/CISupport/build-webkit-org/factories_unittest.py:

Canonical link: https://commits.webkit.org/278561@main
  • Loading branch information
dpino authored and clopez committed May 9, 2024
1 parent 00b3425 commit dff86da
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 4 deletions.
25 changes: 21 additions & 4 deletions Tools/CISupport/build-webkit-org/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@
{ "name": "gtk-linux-bot-20", "platform": "gtk" },
{ "name": "gtk-linux-bot-21", "platform": "gtk" },
{ "name": "gtk-linux-bot-22", "platform": "gtk" },
{ "name": "gtk-linux-bot-23", "platform": "gtk" },

{ "name": "jsconly-linux-igalia-bot-1", "platform": "jsc-only" },
{ "name": "jsconly-linux-igalia-bot-2", "platform": "jsc-only" },
Expand Down Expand Up @@ -143,7 +144,8 @@
{ "name": "wpe-linux-bot-32", "platform": "wpe" },
{ "name": "wpe-linux-bot-33", "platform": "wpe" },
{ "name": "wpe-linux-bot-34", "platform": "wpe" },
{ "name": "wpe-linux-bot-35", "platform": "wpe" }
{ "name": "wpe-linux-bot-35", "platform": "wpe" },
{ "name": "wpe-linux-bot-36", "platform": "wpe" }
],

"builders": [
Expand Down Expand Up @@ -442,10 +444,17 @@
"workernames": ["gtk-linux-bot-21"]
},
{
"name": "GTK-Linux-64bit-Release-Packaging-Nightly-Ubuntu2204", "factory": "BuildAndGenerateMiniBrowserBundleFactory",
"name": "GTK-Linux-64bit-Release-Packaging-Nightly-Ubuntu2004", "factory": "BuildAndGenerateMiniBrowserBundleFactory",
"platform": "gtk", "configuration": "release", "architectures": ["x86_64"],
"additionalArguments": ["--no-bubblewrap-sandbox"],
"workernames": ["gtk-linux-bot-17"]
},
{
"name": "GTK-Linux-64bit-Release-Packaging-Nightly-Ubuntu2204", "factory": "BuildAndGenerateMiniBrowserBundleFactory",
"platform": "gtk", "configuration": "release", "architectures": ["x86_64"],
"additionalArguments": ["--no-bubblewrap-sandbox"],
"workernames": ["gtk-linux-bot-23"]
},
{
"name": "GTK-Linux-64-bit-Release-GTK4-Tests", "factory": "BuildAndTestAndArchiveAllButJSCFactory",
"platform": "gtk-4", "configuration": "release", "architectures": ["x86_64"],
Expand Down Expand Up @@ -557,11 +566,17 @@
"workernames": ["wpe-linux-bot-6"]
},
{
"name": "WPE-Linux-64bit-Release-Packaging-Nightly-Ubuntu2204", "factory": "BuildAndGenerateMiniBrowserBundleFactory",
"name": "WPE-Linux-64bit-Release-Packaging-Nightly-Ubuntu2004", "factory": "BuildAndGenerateMiniBrowserBundleFactory",
"platform": "wpe", "configuration": "release", "architectures": ["x86_64"],
"additionalArguments": ["--no-bubblewrap-sandbox", "--cmakeargs=-DENABLE_WPE_QT_API=OFF"],
"workernames": ["wpe-linux-bot-8"]
},
{
"name": "WPE-Linux-64bit-Release-Packaging-Nightly-Ubuntu2204", "factory": "BuildAndGenerateMiniBrowserBundleFactory",
"platform": "wpe", "configuration": "release", "architectures": ["x86_64"],
"additionalArguments": ["--no-bubblewrap-sandbox", "--cmakeargs=-DENABLE_WPE_QT_API=OFF"],
"workernames": ["wpe-linux-bot-36"]
},
{
"name": "WPE-Linux-64-bit-Release-Non-Unified-Build", "factory": "BuildFactory",
"platform": "wpe", "configuration": "release", "architectures": ["x86_64"],
Expand Down Expand Up @@ -842,7 +857,9 @@
},
{ "type": "Nightly", "name": "NightlyScheduler", "change_filter": "main_filter",
"branch": "main", "hour": 22, "minute": 0,
"builderNames": ["GTK-Linux-64bit-Release-Packaging-Nightly-Ubuntu2204",
"builderNames": ["GTK-Linux-64bit-Release-Packaging-Nightly-Ubuntu2004",
"GTK-Linux-64bit-Release-Packaging-Nightly-Ubuntu2204",
"WPE-Linux-64bit-Release-Packaging-Nightly-Ubuntu2004",
"WPE-Linux-64bit-Release-Packaging-Nightly-Ubuntu2204"]
}
]
Expand Down
26 changes: 26 additions & 0 deletions Tools/CISupport/build-webkit-org/factories_unittest.py
Original file line number Diff line number Diff line change
Expand Up @@ -1057,6 +1057,19 @@ class TestExpectedBuildSteps(unittest.TestCase):
'delete-stale-build-files',
'compile-webkit'
],
'GTK-Linux-64bit-Release-Packaging-Nightly-Ubuntu2004': [
'configure-build',
'configuration',
'clean-and-update-working-directory',
'checkout-specific-revision',
'show-identifier',
'kill-old-processes',
'delete-WebKitBuild-directory',
'delete-stale-build-files',
'jhbuild',
'compile-webkit',
'generate-minibrowser-bundle'
],
'GTK-Linux-64bit-Release-Packaging-Nightly-Ubuntu2204': [
'configure-build',
'configuration',
Expand Down Expand Up @@ -1435,6 +1448,19 @@ class TestExpectedBuildSteps(unittest.TestCase):
'extract-built-product',
'webdriver-test'
],
'WPE-Linux-64bit-Release-Packaging-Nightly-Ubuntu2004': [
'configure-build',
'configuration',
'clean-and-update-working-directory',
'checkout-specific-revision',
'show-identifier',
'kill-old-processes',
'delete-WebKitBuild-directory',
'delete-stale-build-files',
'jhbuild',
'compile-webkit',
'generate-minibrowser-bundle'
],
'WPE-Linux-64bit-Release-Packaging-Nightly-Ubuntu2204': [
'configure-build',
'configuration',
Expand Down

0 comments on commit dff86da

Please sign in to comment.