Skip to content

Commit 349887d

Browse files
authored
chore(benchmark): remove completely the benchmark website (#3145)
This PR removes: - The hooks that update the benchmark website from GitHub Hook - Folder creation, and benchmark website related data - Syncing and Build Scripts for the Benchmark Website This PR updates: - The NGINX config for benchmarking.nodejs.org to redirect to nodejs.org
1 parent e135cbe commit 349887d

8 files changed

Lines changed: 20 additions & 102 deletions

File tree

ansible/www-standalone/resources/config/benchmarking.nodejs.org

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ server {
33
listen [::]:80;
44
server_name benchmarking.nodejs.org;
55

6-
return 301 https://benchmarking.nodejs.org$request_uri;
6+
# Benchmark Website is deprecated we redirect to nodejs.org now
7+
return 301 https://nodejs.org;
78
}
89

910
server {
@@ -15,25 +16,6 @@ server {
1516
ssl_certificate_key ssl/nodejs.key;
1617
ssl_trusted_certificate ssl/nodejs_chained.crt;
1718

18-
keepalive_timeout 60;
19-
server_tokens off;
20-
21-
resolver 8.8.4.4 8.8.8.8 valid=300s;
22-
resolver_timeout 10s;
23-
24-
add_header Strict-Transport-Security max-age=63072000;
25-
add_header X-Frame-Options DENY;
26-
add_header X-Content-Type-Options nosniff;
27-
28-
access_log /var/log/nginx/benchmarking/benchmarking.nodejs.org-access.log nodejs;
29-
error_log /var/log/nginx/benchmarking/benchmarking.nodejs.org-error.log;
30-
31-
gzip on;
32-
gzip_static on;
33-
gzip_disable "MSIE [1-6]\.";
34-
gzip_types text/plain text/css application/javascript text/xml application/xml application/xml+rss image/svg+xml;
35-
36-
root /home/www/benchmarking;
37-
default_type text/plain;
38-
index index.html;
19+
# Benchmark Website is deprecated we redirect to nodejs.org now
20+
return 301 https://nodejs.org;
3921
}

ansible/www-standalone/resources/config/github-webhook.json.j2

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,6 @@
1313
"event": "push",
1414
"match": "ref == \"refs/heads/master\" && repository.full_name == \"nodejs/iojs.org\"",
1515
"exec": "/home/nodejs/build-site.sh iojs"
16-
},
17-
{
18-
"event": "push",
19-
"match": "ref == \"refs/heads/master\" && repository.full_name == \"nodejs/benchmarking\"",
20-
"exec": "/home/nodejs/build-benchmarking-site.sh"
2116
}
2217
]
2318
}

ansible/www-standalone/resources/config/logrotate-nginx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
/var/log/nginx/iojs/iojs.org-error.log
77
/var/log/nginx/libuv/libuv.org-access.log
88
/var/log/nginx/libuv/libuv.org-error.log
9-
/var/log/nginx/benchmarking/benchmarking.nodejs.org-access.log
10-
/var/log/nginx/benchmarking/benchmarking.nodejs.org-error.log
119
/var/log/nginx/coverage/coverage.nodejs.org-access.log
1210
/var/log/nginx/coverage/coverage.nodejs.org-error.log
1311
{

ansible/www-standalone/resources/scripts/build-benchmarking-site.sh

Lines changed: 0 additions & 19 deletions
This file was deleted.

ansible/www-standalone/resources/scripts/sync-benchmarking.sh

Lines changed: 0 additions & 22 deletions
This file was deleted.

ansible/www-standalone/tasks/nginx.yaml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
- name: nginx | Create nginx config symlinks
1515
file:
16-
src: '/etc/nginx/sites-available/{{ item.src }}'
17-
dest: '/etc/nginx/sites-enabled/{{ item.dest }}'
16+
src: "/etc/nginx/sites-available/{{ item.src }}"
17+
dest: "/etc/nginx/sites-enabled/{{ item.dest }}"
1818
state: link
1919
with_items:
2020
- { src: nodejs.org, dest: 00-nodejs.org }
@@ -81,8 +81,8 @@
8181
- name: nginx | Add extra mime-type
8282
lineinfile:
8383
dest: /etc/nginx/mime.types
84-
line: '{{ item }}'
85-
insertafter: '^types.*'
84+
line: "{{ item }}"
85+
insertafter: "^types.*"
8686
with_items:
8787
- 'application/octet-stream lib;'
8888
- 'application/octet-stream pkg;'
@@ -101,17 +101,16 @@
101101

102102
- name: nginx | Make /var/log/nginx/ subdirectories
103103
file:
104-
path: '/var/log/nginx/{{ item }}'
104+
path: "/var/log/nginx/{{ item }}"
105105
state: directory
106106
mode: 0755
107107
owner: www-data
108108
group: adm
109109
with_items:
110-
- 'nodejs'
111-
- 'iojs'
112-
- 'libuv'
113-
- 'benchmarking'
114-
- 'coverage'
110+
- "nodejs"
111+
- "iojs"
112+
- "libuv"
113+
- "coverage"
115114
tags: nginx
116115

117116
- name: nginx | Restart service

ansible/www-standalone/tasks/site-setup.yaml

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
group: nodejs
88
with_items:
99
- build-site.sh
10-
- build-benchmarking-site.sh
1110
- check-build-site.sh
1211
tags: setup
1312

@@ -22,7 +21,6 @@
2221
- /home/www/iojs
2322
- /home/www/nodejs
2423
- /home/www/github
25-
- /home/www/benchmarking
2624
- /home/www/coverage
2725
tags: setup
2826

@@ -70,15 +68,6 @@
7068
group: root
7169
tags: setup
7270

73-
- name: Site Setup | Copy sync-benchmarking.sh script
74-
copy:
75-
src: ./resources/scripts/sync-benchmarking.sh
76-
dest: /home/nodejs/sync-benchmarking.sh
77-
mode: 0755
78-
owner: root
79-
group: root
80-
tags: setup
81-
8271
- name: Site Setup | Make /home/nodejs/.npm
8372
file:
8473
path: /home/nodejs/.npm
@@ -95,25 +84,23 @@
9584
owner: nodejs
9685
tags: setup
9786

98-
- name: Site Setup | Initial nodejs, iojs and benchmarking clone and update
87+
- name: Site Setup | Initial nodejs, iojs clone and update
9988
become: yes
10089
become_user: "nodejs"
10190
command: "{{ item }}"
10291
with_items:
10392
- "/home/nodejs/build-site.sh nodejs"
10493
- "/home/nodejs/build-site.sh iojs"
105-
- "/home/nodejs/build-benchmarking-site.sh"
10694
tags: setup
10795

10896
- name: Site Setup | Add periodic tasks to crontab
10997
lineinfile:
11098
dest: /etc/crontab
11199
line: "{{ item }}"
112100
with_items:
113-
- '*/30 * * * * dist /home/staging/tools/promote/promote_nightly.sh nodejs'
114-
- '*/5 * * * * nodejs /home/nodejs/check-build-site.sh nodejs'
115-
- '*/5 * * * * root /home/nodejs/cdn-purge.sh'
116-
- '0 */4 * * * nodejs /home/nodejs/sync-benchmarking.sh'
101+
- "*/30 * * * * dist /home/staging/tools/promote/promote_nightly.sh nodejs"
102+
- "*/5 * * * * nodejs /home/nodejs/check-build-site.sh nodejs"
103+
- "*/5 * * * * root /home/nodejs/cdn-purge.sh"
117104
tags: setup
118105

119106
- name: Site Setup | Add dist-perms script in cron.daily

jenkins/scripts/coverage/README.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ in the other sections, the job is pegged to run on:
8888

8989

9090
# Transfer to benchmarking data machine
91+
9192
The rsync from the machine on which the job runs to the benchmarking
9293
data machine requires an ssh key. Currently we have pegged the job to the
9394
benchmarking machine
@@ -107,8 +108,5 @@ Host coveragedata
107108
The results are pushed to /home/benchmark/coverage-out/out.
108109

109110
# Transfer to the website
110-
As mentioned earlier, the website will pull updates hourly from
111-
/home/benchmark/coverage-out/out and put
112-
them in the right place to be served at coverage.nodejs.org. The key
113-
required to do this is already in place in order to support the similar process
114-
for benchmarking.nodejs.org
111+
112+
The benchmark.nodejs.org website is archived and the data is not synced anymore.

0 commit comments

Comments
 (0)