Replace Google App Engine with AppScale

https://bugs.webkit.org/show_bug.cgi?id=147178

Patch by Aakash Jain <aakash_jain@apple.com> on 2015-07-30
Reviewed by Daniel Bates.

Tools:

* BuildSlaveSupport/build.webkit.org-config/master.cfg:
(RunWebKitTests):
* BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/garden-o-matic.html:
* BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/builders_unittests.js:
* BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui.js:
* BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/notifications_unittests.js:
* BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/results.js:
(.):
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BubbleQueueServer.js:
(BubbleQueueServer):
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitTestHistory.js:
(TestHistory):
* BuildSlaveSupport/build.webkit.org-config/templates/root.html:
* QueueStatusServer/app.yaml: We must explicitly define threadsafe property when using the Python 2.7 runtime. We set threadsafe to be false because the status server code was written to be run in AppEngine's CGI environment and AppEngine's CGI programming model handles requests serially per section "Concurrent Requests and WSGI" of <https://cloud.google.com/appengine/docs/python/python25/migrate27>.
* TestResultServer/app.yaml: Ditto
* Scripts/webkitpy/common/config/urls.py:
* TestResultServer/main.py:
* TestResultServer/static-dashboards/dashboard_base.js:
* TestResultServer/static-dashboards/loader.js:

Websites/bugs.webkit.org:

* code-review.js:
* template/en/default/attachment/edit.html.tmpl:
* template/en/default/attachment/list.html.tmpl:
* template/en/default/attachment/reviewform.html.tmpl:

LayoutTests:

* fast/harness/results.html:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@187605 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 2064777..9b12270 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2015-07-30  Aakash Jain  <aakash_jain@apple.com>
+
+        Replace Google App Engine with AppScale
+        https://bugs.webkit.org/show_bug.cgi?id=147178
+
+        Reviewed by Daniel Bates.
+
+        * fast/harness/results.html:
+
 2015-07-30  Joonghun Park  <jh718.park@samsung.com>
 
         [EFL] Enable IndexedDB based on DatabaseProcess

diff --git a/LayoutTests/fast/harness/results.html b/LayoutTests/fast/harness/results.html
index 9db2963..e738380 100644 (file)
--- a/LayoutTests/fast/harness/results.html
+++ b/LayoutTests/fast/harness/results.html
@@ -633,7 +633,7 @@ function flakinessDashboardURLForTests(testObjects)
             testList += ",";
     }
 
-    return 'http://webkit-test-results.appspot.com/dashboards/flakiness_dashboard.html#showAllRuns=true&tests=' + encodeURIComponent(testList);
+    return 'http://webkit-test-results.webkit.org/dashboards/flakiness_dashboard.html#showAllRuns=true&tests=' + encodeURIComponent(testList);
 }
 
 function tableRow(testObject)

diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg b/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg
index da19767..f9430ae 100644 (file)
--- a/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg
+++ b/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg
@@ -323,7 +323,7 @@ class RunWebKitTests(shell.Test):
                "--builder-name", WithProperties("%(buildername)s"),
                "--build-number", WithProperties("%(buildnumber)s"),
                "--master-name", "webkit.org",
-               "--test-results-server", "webkit-test-results.appspot.com",
+               "--test-results-server", "webkit-test-results.webkit.org",
                "--exit-after-n-crashes-or-timeouts", "50",
                "--exit-after-n-failures", "500",
                WithProperties("--%(configuration)s")]

diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/garden-o-matic.html b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/garden-o-matic.html
index 43b9373..3c603f8 100644 (file)
--- a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/garden-o-matic.html
+++ b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/garden-o-matic.html
@@ -34,7 +34,7 @@ James, a web developer from Birmingham, UK.
                                          font-src http://themes.googleusercontent.com;
                                          img-src 'self' https://ajax.googleapis.com https://build.webkit.org;
                                          media-src 'self' https://build.webkit.org;
-                                         frame-src 'self' https://build.webkit.org https://webkit-test-results.appspot.com;
+                                         frame-src 'self' https://build.webkit.org https://webkit-test-results.webkit.org;
                                          connect-src 'self' https://trac.webkit.org https://build.webkit.org">
 <title>Garden-O-Matic</title>
 <link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Open+Sans:400,700">

diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/builders_unittests.js b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/builders_unittests.js
index 6c7411a..7d5c13c 100644 (file)
--- a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/builders_unittests.js
+++ b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/builders_unittests.js
@@ -284,7 +284,7 @@ var kExampleBuildInfoJSON = {
         "results": [2, ["webkit_tests"]],
         "statistics": {},
         "step_number": 5,
-        "text": ["webkit_tests", "2014 fixable", "(370 skipped)", "failed 1", "<div class=\"BuildResultInfo\">", "<a href=\"http://webkit-test-results.appspot.com/dashboards/flakiness_dashboard.html#master=ChromiumWebkit&tests=fast/box-shadow/box-shadow-clipped-slices.html\">", "<abbr title=\"fast/box-shadow/box-shadow-clipped-slices.html\">box-shadow-clipped-slices.html</abbr>", "</a>", "</div>"],
+        "text": ["webkit_tests", "2014 fixable", "(370 skipped)", "failed 1", "<div class=\"BuildResultInfo\">", "<a href=\"http://webkit-test-results.webkit.org/dashboards/flakiness_dashboard.html#master=ChromiumWebkit&tests=fast/box-shadow/box-shadow-clipped-slices.html\">", "<abbr title=\"fast/box-shadow/box-shadow-clipped-slices.html\">box-shadow-clipped-slices.html</abbr>", "</a>", "</div>"],
         "times": [1312444452.306695, 1312444768.888266],
         "urls": {}
     }, {
@@ -320,7 +320,7 @@ var kExampleBuildInfoJSON = {
         "results": [2, ["webkit_gpu_tests"]],
         "statistics": {},
         "step_number": 7,
-        "text": ["webkit_gpu_tests", "148 fixable", "(24 skipped)", "failed 1", "<div class=\"BuildResultInfo\">", "<a href=\"http://webkit-test-results.appspot.com/dashboards/flakiness_dashboard.html#master=ChromiumWebkit&tests=compositing/scaling/tiled-layer-recursion.html\">", "<abbr title=\"compositing/scaling/tiled-layer-recursion.html\">tiled-layer-recursion.html</abbr>", "</a>", "</div>"],
+        "text": ["webkit_gpu_tests", "148 fixable", "(24 skipped)", "failed 1", "<div class=\"BuildResultInfo\">", "<a href=\"http://webkit-test-results.webkit.org/dashboards/flakiness_dashboard.html#master=ChromiumWebkit&tests=compositing/scaling/tiled-layer-recursion.html\">", "<abbr title=\"compositing/scaling/tiled-layer-recursion.html\">tiled-layer-recursion.html</abbr>", "</a>", "</div>"],
         "times": [1312444781.444903, 1312444966.856074],
         "urls": {}
     }, {
@@ -910,7 +910,7 @@ var kExamplePerfBuildInfoJSON = {
         "results": [2, ["webkit_tests"]],
         "statistics": {},
         "step_number": 5,
-        "text": ["webkit_tests", "2014 fixable", "(370 skipped)", "failed 1", "<div class=\"BuildResultInfo\">", "<a href=\"http://webkit-test-results.appspot.com/dashboards/flakiness_dashboard.html#master=ChromiumWebkit&tests=fast/box-shadow/box-shadow-clipped-slices.html\">", "<abbr title=\"fast/box-shadow/box-shadow-clipped-slices.html\">box-shadow-clipped-slices.html</abbr>", "</a>", "</div>"],
+        "text": ["webkit_tests", "2014 fixable", "(370 skipped)", "failed 1", "<div class=\"BuildResultInfo\">", "<a href=\"http://webkit-test-results.webkit.org/dashboards/flakiness_dashboard.html#master=ChromiumWebkit&tests=fast/box-shadow/box-shadow-clipped-slices.html\">", "<abbr title=\"fast/box-shadow/box-shadow-clipped-slices.html\">box-shadow-clipped-slices.html</abbr>", "</a>", "</div>"],
         "times": [1312444452.306695, 1312444768.888266],
         "urls": {}
     }, {
@@ -946,7 +946,7 @@ var kExamplePerfBuildInfoJSON = {
         "results": [2, ["webkit_gpu_tests"]],
         "statistics": {},
         "step_number": 7,
-        "text": ["webkit_gpu_tests", "148 fixable", "(24 skipped)", "failed 1", "<div class=\"BuildResultInfo\">", "<a href=\"http://webkit-test-results.appspot.com/dashboards/flakiness_dashboard.html#master=ChromiumWebkit&tests=compositing/scaling/tiled-layer-recursion.html\">", "<abbr title=\"compositing/scaling/tiled-layer-recursion.html\">tiled-layer-recursion.html</abbr>", "</a>", "</div>"],
+        "text": ["webkit_gpu_tests", "148 fixable", "(24 skipped)", "failed 1", "<div class=\"BuildResultInfo\">", "<a href=\"http://webkit-test-results.webkit.org/dashboards/flakiness_dashboard.html#master=ChromiumWebkit&tests=compositing/scaling/tiled-layer-recursion.html\">", "<abbr title=\"compositing/scaling/tiled-layer-recursion.html\">tiled-layer-recursion.html</abbr>", "</a>", "</div>"],
         "times": [1312444781.444903, 1312444966.856074],
         "urls": {}
     }, {

diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui.js b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui.js
index f08ddae..13358a5 100644 (file)
--- a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui.js
+++ b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui.js
@@ -47,7 +47,7 @@ ui.urlForTest = function(testName)
 ui.urlForFlakinessDashboard = function(opt_testNameList)
 {
     var testsParameter = opt_testNameList ? opt_testNameList.join(',') : '';
-    return 'https://webkit-test-results.appspot.com/dashboards/flakiness_dashboard.html#tests=' + encodeURIComponent(testsParameter);
+    return 'https://webkit-test-results.webkit.org/dashboards/flakiness_dashboard.html#tests=' + encodeURIComponent(testsParameter);
 }
 
 ui.urlForEmbeddedFlakinessDashboard = function(opt_testNameList)

diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/notifications_unittests.js b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/notifications_unittests.js
index 43f5e29..be7b4b3 100644 (file)
--- a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/notifications_unittests.js
+++ b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/notifications_unittests.js
@@ -79,7 +79,7 @@ test('Info', 2, function() {
 test('FailingTestGroup', 2, function() {
     var failingTest = new ui.notifications.FailingTestGroup('test', ['test.html']);
     equal(failingTest.tagName, 'LI');
-    equal(failingTest.innerHTML, '<a href="http://webkit-test-results.appspot.com/dashboards/flakiness_dashboard.html#tests=test.html" target="_blank">test</a>');
+    equal(failingTest.innerHTML, '<a href="http://webkit-test-results.webkit.org/dashboards/flakiness_dashboard.html#tests=test.html" target="_blank">test</a>');
 });
 
 test('SuspiciousCommit', 2, function() {
@@ -130,7 +130,7 @@ test('FailingTestsSummary', 12, function() {
         '<div class="what">' +
             '<div class="problem">' +
                 '<ul class="effects">' +
-                    '<li><a href="http://webkit-test-results.appspot.com/dashboards/flakiness_dashboard.html#tests=test" target="_blank">test</a></li>' +
+                    '<li><a href="http://webkit-test-results.webkit.org/dashboards/flakiness_dashboard.html#tests=test" target="_blank">test</a></li>' +
                 '</ul>' +
                 '<ul class="actions">' +
                     '<li><button class="action default" title="Examine these failures in detail.">Examine</button></li>' +
@@ -153,7 +153,7 @@ test('FailingTestsSummary', 12, function() {
         '<div class="what">' +
             '<div class="problem">' +
                 '<ul class="effects">' +
-                    '<li><a href="http://webkit-test-results.appspot.com/dashboards/flakiness_dashboard.html#tests=test" target="_blank">test</a></li>' +
+                    '<li><a href="http://webkit-test-results.webkit.org/dashboards/flakiness_dashboard.html#tests=test" target="_blank">test</a></li>' +
                 '</ul>' +
                 '<ul class="actions">' +
                     '<li><button class="action default" title="Examine these failures in detail.">Examine</button></li>' +
@@ -178,7 +178,7 @@ test('FailingTestsSummary', 12, function() {
         '<div class="what">' +
             '<div class="problem">' +
                 '<ul class="effects">' +
-                    '<li><a href="http://webkit-test-results.appspot.com/dashboards/flakiness_dashboard.html#tests=test" target="_blank">test</a></li>' +
+                    '<li><a href="http://webkit-test-results.webkit.org/dashboards/flakiness_dashboard.html#tests=test" target="_blank">test</a></li>' +
                 '</ul>' +
                 '<ul class="actions">' +
                     '<li><button class="action default" title="Examine these failures in detail.">Examine</button></li>' +
@@ -218,8 +218,8 @@ test('FailingTestsSummary', 12, function() {
         '<div class="what">' +
             '<div class="problem">' +
                 '<ul class="effects">' +
-                    '<li><a href="http://webkit-test-results.appspot.com/dashboards/flakiness_dashboard.html#tests=foo" target="_blank">foo</a></li>' +
-                    '<li><a href="http://webkit-test-results.appspot.com/dashboards/flakiness_dashboard.html#tests=test" target="_blank">test</a></li>' +
+                    '<li><a href="http://webkit-test-results.webkit.org/dashboards/flakiness_dashboard.html#tests=foo" target="_blank">foo</a></li>' +
+                    '<li><a href="http://webkit-test-results.webkit.org/dashboards/flakiness_dashboard.html#tests=test" target="_blank">test</a></li>' +
                 '</ul>' +
                 '<ul class="actions">' +
                     '<li><button class="action default" title="Examine these failures in detail.">Examine</button></li>' +
@@ -263,8 +263,8 @@ test('FailingTestsSummary', 12, function() {
         '<div class="what">' +
             '<div class="problem">' +
                 '<ul class="effects">' +
-                    '<li><a href="http://webkit-test-results.appspot.com/dashboards/flakiness_dashboard.html#tests=foo" target="_blank">foo</a></li>' +
-                    '<li><a href="http://webkit-test-results.appspot.com/dashboards/flakiness_dashboard.html#tests=test" target="_blank">test</a></li>' +
+                    '<li><a href="http://webkit-test-results.webkit.org/dashboards/flakiness_dashboard.html#tests=foo" target="_blank">foo</a></li>' +
+                    '<li><a href="http://webkit-test-results.webkit.org/dashboards/flakiness_dashboard.html#tests=test" target="_blank">test</a></li>' +
                 '</ul>' +
                 '<ul class="actions">' +
                     '<li><button class="action default" title="Examine these failures in detail.">Examine</button></li>' +
@@ -304,8 +304,8 @@ test('FailingTestsSummary (grouping)', 1, function() {
         '<div class="what">' +
             '<div class="problem">' +
                 '<ul class="effects">' +
-                    '<li><a href="http://webkit-test-results.appspot.com/dashboards/flakiness_dashboard.html#tests=path%2Fto%2Ftest1.html%2Cpath%2Fto%2Ftest2.html%2Cpath%2Fto%2Ftest3.html%2Cpath%2Fto%2Ftest4.html" target="_blank">path/to (4 tests)</a></li>' +
-                    '<li><a href="http://webkit-test-results.appspot.com/dashboards/flakiness_dashboard.html#tests=path%2Fanother%2Ftest.html" target="_blank">path/another/test.html</a></li>' +
+                    '<li><a href="http://webkit-test-results.webkit.org/dashboards/flakiness_dashboard.html#tests=path%2Fto%2Ftest1.html%2Cpath%2Fto%2Ftest2.html%2Cpath%2Fto%2Ftest3.html%2Cpath%2Fto%2Ftest4.html" target="_blank">path/to (4 tests)</a></li>' +
+                    '<li><a href="http://webkit-test-results.webkit.org/dashboards/flakiness_dashboard.html#tests=path%2Fanother%2Ftest.html" target="_blank">path/another/test.html</a></li>' +
                 '</ul>' +
                 '<ul class="actions">' +
                     '<li><button class="action default" title="Examine these failures in detail.">Examine</button></li>' +

diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/results.js b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/results.js
index 0eb12a4..5255420 100644 (file)
--- a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/results.js
+++ b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/results.js
@@ -207,7 +207,7 @@ ui.results.FlakinessData = base.extends('iframe', {
         // Check for null event.origin so that the unittests can get past this point.
         // FIXME: Is this safe? In practice, there's no meaningful harm that can come from
         // a malicious page sending us heightChanged commands, so it doesn't really matter.
-        if (event.origin !== 'null' && event.origin != 'https://webkit-test-results.appspot.com') {
+        if (event.origin !== 'null' && event.origin != 'https://webkit-test-results.webkit.org') {
             console.log('Invalid origin: ' + event.origin);
             return;
         }

diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BubbleQueueServer.js b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BubbleQueueServer.js
index 245f555..2d7c051 100644 (file)
--- a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BubbleQueueServer.js
+++ b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BubbleQueueServer.js
@@ -38,7 +38,7 @@ BubbleQueueServer = function()
 
     BaseObject.call(this);
 
-    this.baseURL = "https://webkit-queues.appspot.com/";
+    this.baseURL = "https://webkit-queues.webkit.org/";
     this.queues = {};
 
     for (var id in queueInfo)

diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitTestHistory.js b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitTestHistory.js
index 2c8e55f..38844b0 100644 (file)
--- a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitTestHistory.js
+++ b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitTestHistory.js
@@ -25,7 +25,7 @@
 
 TestHistory = function()
 {
-    this._baseURL = "https://webkit-test-results.appspot.com/dashboards/flakiness_dashboard.html";
+    this._baseURL = "https://webkit-test-results.webkit.org/dashboards/flakiness_dashboard.html";
 };
 
 BaseObject.addConstructorFunctions(TestHistory);

diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/templates/root.html b/Tools/BuildSlaveSupport/build.webkit.org-config/templates/root.html
index 0147271..d04f037 100644 (file)
--- a/Tools/BuildSlaveSupport/build.webkit.org-config/templates/root.html
+++ b/Tools/BuildSlaveSupport/build.webkit.org-config/templates/root.html
@@ -37,7 +37,7 @@
 
 <h2>Tests and Performance</h2>
 <ul>
-  <li><a href="https://webkit-test-results.appspot.com/dashboards/flakiness_dashboard.html">Flakiness dashboard</a> (External site)</li>
+  <li><a href="https://webkit-test-results.webkit.org/dashboards/flakiness_dashboard.html">Flakiness dashboard</a> (External site)</li>
   <li><a href="LeaksViewer">Leaks Viewer</a></li>
   <li><a href="TestFailures">Test Failures</a></li>
   <li><a href="https://perf.webkit.org/">WebKit Perf Monitor</a> results submitted by <a href="https://build.webkit.org/waterfall?show=Apple%20Mavericks%20Release%20WK2%20%28Perf%29&show=Apple%20Yosemite%20Release%20WK2%20%28Perf%29&show=EFL%20Linux%2064-bit%20Release%20WK2%20%28Perf%29&show=GTK%20Linux%2064-bit%20Release%20%28Perf%29">performance bots</a></li>
@@ -45,7 +45,7 @@
 
 <h2>Status</h2>
 <ul>
-    <li><a href="https://webkit-queues.appspot.com/">Early Warning System and Commit Queue Status</a> (External site)</li>
+    <li><a href="https://webkit-queues.webkit.org/">Early Warning System and Commit Queue Status</a> (External site)</li>
 </ul>
 
 </body>

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index e6daf3e..fee37b3 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,30 @@
+2015-07-30  Aakash Jain  <aakash_jain@apple.com>
+
+        Replace Google App Engine with AppScale
+        https://bugs.webkit.org/show_bug.cgi?id=147178
+
+        Reviewed by Daniel Bates.
+
+        * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+        (RunWebKitTests):
+        * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/garden-o-matic.html:
+        * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/builders_unittests.js:
+        * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui.js:
+        * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/notifications_unittests.js:
+        * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/results.js:
+        (.):
+        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BubbleQueueServer.js:
+        (BubbleQueueServer):
+        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitTestHistory.js:
+        (TestHistory):
+        * BuildSlaveSupport/build.webkit.org-config/templates/root.html:
+        * QueueStatusServer/app.yaml: We must explicitly define threadsafe property when using the Python 2.7 runtime. We set threadsafe to be false because the status server code was written to be run in AppEngine's CGI environment and AppEngine's CGI programming model handles requests serially per section "Concurrent Requests and WSGI" of <https://cloud.google.com/appengine/docs/python/python25/migrate27>.
+        * TestResultServer/app.yaml: Ditto
+        * Scripts/webkitpy/common/config/urls.py:
+        * TestResultServer/main.py:
+        * TestResultServer/static-dashboards/dashboard_base.js:
+        * TestResultServer/static-dashboards/loader.js:
+
 2015-07-30  Joonghun Park  <jh718.park@samsung.com>
 
         [EFL] Enable IndexedDB based on DatabaseProcess

diff --git a/Tools/QueueStatusServer/app.yaml b/Tools/QueueStatusServer/app.yaml
index 1471f24..92233a5 100644 (file)
--- a/Tools/QueueStatusServer/app.yaml
+++ b/Tools/QueueStatusServer/app.yaml
@@ -1,6 +1,7 @@
 application: webkit-queues
 version: 178455 # SVN revision of last major change
-runtime: python
+runtime: python27
+threadsafe: false
 api_version: 1
 
 builtins:

diff --git a/Tools/Scripts/webkitpy/common/config/urls.py b/Tools/Scripts/webkitpy/common/config/urls.py
index a49ffd2..48ecec2 100644 (file)
--- a/Tools/Scripts/webkitpy/common/config/urls.py
+++ b/Tools/Scripts/webkitpy/common/config/urls.py
@@ -54,7 +54,7 @@ buildbot_url = "https://build.webkit.org"
 svn_server_host = "svn.webkit.org"
 svn_server_realm = "<http://svn.webkit.org:80> Mac OS Forge"
 
-statusserver_default_host = "webkit-queues.appspot.com"
+statusserver_default_host = "webkit-queues.webkit.org"
 
 def parse_bug_id(string):
     if not string:

diff --git a/Tools/TestResultServer/app.yaml b/Tools/TestResultServer/app.yaml
index 47b94ed..064a8ce 100644 (file)
--- a/Tools/TestResultServer/app.yaml
+++ b/Tools/TestResultServer/app.yaml
@@ -1,6 +1,7 @@
 application: webkit-test-results
 version: 182606
-runtime: python
+runtime: python27
+threadsafe: false
 api_version: 1
 
 handlers:

diff --git a/Tools/TestResultServer/main.py b/Tools/TestResultServer/main.py
index 2fa61e5..a9b00cf 100644 (file)
--- a/Tools/TestResultServer/main.py
+++ b/Tools/TestResultServer/main.py
@@ -28,7 +28,7 @@
 
 # Request a modern Django
 from google.appengine.dist import use_library
-use_library('django', '1.1')
+use_library('django', '1.3')
 
 from google.appengine.ext import webapp
 from google.appengine.ext.webapp.util import run_wsgi_app

diff --git a/Tools/TestResultServer/static-dashboards/dashboard_base.js b/Tools/TestResultServer/static-dashboards/dashboard_base.js
index bea34d1..3d0c40e 100644 (file)
--- a/Tools/TestResultServer/static-dashboards/dashboard_base.js
+++ b/Tools/TestResultServer/static-dashboards/dashboard_base.js
@@ -72,8 +72,8 @@ var TESTS_KEY = 'tests';
 var ONE_DAY_SECONDS = 60 * 60 * 24;
 var ONE_WEEK_SECONDS = ONE_DAY_SECONDS * 7;
 
-// These should match the testtype uploaded to webkit-test-results.appspot.com.
-// See http://webkit-test-results.appspot.com/testfile.
+// These should match the testtype uploaded to webkit-test-results.webkit.org.
+// See http://webkit-test-results.webkit.org/testfile.
 var TEST_TYPES = [
     'layout-tests'
 ];

diff --git a/Tools/TestResultServer/static-dashboards/loader.js b/Tools/TestResultServer/static-dashboards/loader.js
index f99c493..59f7cc2 100644 (file)
--- a/Tools/TestResultServer/static-dashboards/loader.js
+++ b/Tools/TestResultServer/static-dashboards/loader.js
@@ -31,7 +31,7 @@ var loader = loader || {};
 
 (function() {
 
-var TEST_RESULTS_SERVER = 'https://webkit-test-results.appspot.com/';
+var TEST_RESULTS_SERVER = 'https://webkit-test-results.webkit.org/';
 
 function pathToBuilderResultsFile(builderName) {
     return TEST_RESULTS_SERVER + 'testfile?builder=' + builderName +

diff --git a/Websites/bugs.webkit.org/ChangeLog b/Websites/bugs.webkit.org/ChangeLog
index 4bfe9cb..04a9cf9 100644 (file)
--- a/Websites/bugs.webkit.org/ChangeLog
+++ b/Websites/bugs.webkit.org/ChangeLog
@@ -1,3 +1,15 @@
+2015-07-30  Aakash Jain  <aakash_jain@apple.com>
+
+        Replace Google App Engine with AppScale
+        https://bugs.webkit.org/show_bug.cgi?id=147178
+
+        Reviewed by Daniel Bates.
+
+        * code-review.js:
+        * template/en/default/attachment/edit.html.tmpl:
+        * template/en/default/attachment/list.html.tmpl:
+        * template/en/default/attachment/reviewform.html.tmpl:
+
 2014-09-03  David Kilzer  <ddkilzer@apple.com>
 
         Make images work with patches created using svn 1.7

diff --git a/Websites/bugs.webkit.org/code-review.js b/Websites/bugs.webkit.org/code-review.js
index d93ee6e..877b3b3 100644 (file)
--- a/Websites/bugs.webkit.org/code-review.js
+++ b/Websites/bugs.webkit.org/code-review.js
@@ -536,7 +536,7 @@ var CODE_REVIEW_UNITTEST;
   }
 
   window.addEventListener('message', function(e) {
-    if (e.origin != 'https://webkit-queues.appspot.com')
+    if (e.origin != 'https://webkit-queues.webkit.org')
       return;
 
     if (e.data.height) {
@@ -546,7 +546,7 @@ var CODE_REVIEW_UNITTEST;
   }, false);
 
   function handleStatusBubbleLoad(e) {
-    e.target.contentWindow.postMessage('containerMetrics', 'https://webkit-queues.appspot.com');
+    e.target.contentWindow.postMessage('containerMetrics', 'https://webkit-queues.webkit.org');
   }
 
   function fetchHistory() {
@@ -580,7 +580,7 @@ var CODE_REVIEW_UNITTEST;
 
       statusBubble = document.createElement('iframe');
       statusBubble.className = 'statusBubble';
-      statusBubble.src  = 'https://webkit-queues.appspot.com/status-bubble/' + attachment_id;
+      statusBubble.src  = 'https://webkit-queues.webkit.org/status-bubble/' + attachment_id;
       statusBubble.scrolling = 'no';
       // Can't append the HTML because we need to set the onload handler before appending the iframe to the DOM.
       statusBubble.onload = handleStatusBubbleLoad;

diff --git a/Websites/bugs.webkit.org/template/en/default/attachment/edit.html.tmpl b/Websites/bugs.webkit.org/template/en/default/attachment/edit.html.tmpl
index ac3d6db..88d7029 100644 (file)
--- a/Websites/bugs.webkit.org/template/en/default/attachment/edit.html.tmpl
+++ b/Websites/bugs.webkit.org/template/en/default/attachment/edit.html.tmpl
@@ -264,7 +264,7 @@
         Bot Status:
 
         <div class="statusBubble">
-          <iframe src="https://webkit-queues.appspot.com/status-bubble/[% attachment.id %]"
+          <iframe src="https://webkit-queues.webkit.org/status-bubble/[% attachment.id %]"
                   style="width: 400px; height: 40px; border: none;" scrolling="no">
           </iframe>
         </div>

diff --git a/Websites/bugs.webkit.org/template/en/default/attachment/list.html.tmpl b/Websites/bugs.webkit.org/template/en/default/attachment/list.html.tmpl
index ea7ea24..24a3828 100644 (file)
--- a/Websites/bugs.webkit.org/template/en/default/attachment/list.html.tmpl
+++ b/Websites/bugs.webkit.org/template/en/default/attachment/list.html.tmpl
@@ -157,7 +157,7 @@ function toggle_display(link) {
 [%# if WEBKIT_CHANGES %]
           [% IF attachment.ispatch %]
           <div class="statusBubble">
-            <iframe src="https://webkit-queues.appspot.com/status-bubble/[% attachment.id %]"
+            <iframe src="https://webkit-queues.webkit.org/status-bubble/[% attachment.id %]"
                     style="width: 600px; height: 20px; border: none;" scrolling="no">
             </iframe>
           </div>

diff --git a/Websites/bugs.webkit.org/template/en/default/attachment/reviewform.html.tmpl b/Websites/bugs.webkit.org/template/en/default/attachment/reviewform.html.tmpl
index d1194a8..9521adf 100644 (file)
--- a/Websites/bugs.webkit.org/template/en/default/attachment/reviewform.html.tmpl
+++ b/Websites/bugs.webkit.org/template/en/default/attachment/reviewform.html.tmpl
@@ -94,7 +94,7 @@
     <tr>
     <td>
       <div class="statusBubble" style="margin-left: 30px;">
-        <iframe src="https://webkit-queues.appspot.com/status-bubble/[% attachment.id %]"
+        <iframe src="https://webkit-queues.webkit.org/status-bubble/[% attachment.id %]"
                 style="width: 400px; height: 20px; border: none;" scrolling="no">
         </iframe>
       </div>