From 03376920c3742cfde4e378454bc66708751c6cd5 Mon Sep 17 00:00:00 2001 From: Mihai Plesa Date: Fri, 27 Dec 2019 13:47:48 +0000 Subject: [PATCH 01/12] added proxy for build deps --- Jenkinsfile | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7949e35e08..eb4f57937f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -318,8 +318,43 @@ pipeline { } steps { sh """ +cat > /home/ubuntu/squid.conf < Date: Fri, 3 Jan 2020 14:05:16 +0000 Subject: [PATCH 02/12] fix --- Jenkinsfile | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index eb4f57937f..6c87d1ad67 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -332,27 +332,24 @@ acl CONNECT method CONNECT http_access allow localhost manager http_access deny manager -# -# INSERT YOUR OWN RULE(S) HERE TO ALLOW ACCESS FROM YOUR CLIENTS -# - http_access allow localnet http_access allow localhost http_access deny all -maximum_object_size 6 GB -cache_dir ufs /var/spool/squid 30720 16 256 -cache_mem 256 MB -maximum_object_size_in_memory 512 KB +#cache_dir ufs /var/spool/squid 30720 16 256 +#maximum_object_size 4 GB +cache_mem 16 GB +maximum_object_size_in_memory 4 GB cache_replacement_policy heap LFUDA range_offset_limit -1 quick_abort_min -1 KB EOL + mkdir /home/ubuntu/squid || true docker run --name squid -d --rm -p 3128:3128 --volume /home/ubuntu/squid:/var/spool/squid --volume /home/ubuntu/squid.conf:/etc/squid/squid.conf sameersbn/squid || true docker restart squid - #docker run --name squid -d --rm --publish 3128:3128 --mount type=bind,source=sq,target=/etc/squid sameersbn/squid - #docker run --name squid -d -p 3128:3128 --volume ~/squid:/var/spool/squid datadog/squid + # docker run --name squid -d --rm --publish 3128:3128 --mount type=bind,source=sq,target=/etc/squid sameersbn/squid + # docker run --name squid -d -p 3128:3128 --volume ~/squid:/var/spool/squid datadog/squid rm -rf src/brave HTTP_PROXY=http://127.0.0.1:3128 HTTPS_PROXY=http://127.0.0.1:3128 npm run init """ From d5e8281bba68bd99a38462774fcae1338f7a9a47 Mon Sep 17 00:00:00 2001 From: Mihai Plesa Date: Fri, 3 Jan 2020 14:27:00 +0000 Subject: [PATCH 03/12] fix --- Jenkinsfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6c87d1ad67..af4411bb57 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,7 +10,7 @@ pipeline { choice(name: "CHANNEL", choices: ["nightly", "dev", "beta", "release", "development"], description: "") string(name: "SLACK_BUILDS_CHANNEL", defaultValue: "#build-downloads-bot", description: "The Slack channel to send the list of artifact download links to. Leave blank to skip sending the message.") booleanParam(name: "SKIP_SIGNING", defaultValue: true, description: "") - booleanParam(name: "WIPE_WORKSPACE", defaultValue: false, description: "") + booleanParam(name: "WIPE_WORKSPACE", defaultValue: true, description: "") booleanParam(name: "SKIP_INIT", defaultValue: false, description: "") booleanParam(name: "DISABLE_SCCACHE", defaultValue: false, description: "") booleanParam(name: "DCHECK_ALWAYS_ON", defaultValue: true, description: "") @@ -336,10 +336,10 @@ http_access allow localnet http_access allow localhost http_access deny all -#cache_dir ufs /var/spool/squid 30720 16 256 -#maximum_object_size 4 GB -cache_mem 16 GB -maximum_object_size_in_memory 4 GB +cache_dir ufs /var/spool/squid 30720 16 256 +maximum_object_size 4 GB +# cache_mem 16 GB +# maximum_object_size_in_memory 4 GB cache_replacement_policy heap LFUDA range_offset_limit -1 quick_abort_min -1 KB From 01932a1123b47ff06ff3bb118634243ff95973c3 Mon Sep 17 00:00:00 2001 From: Mihai Plesa Date: Fri, 3 Jan 2020 14:40:47 +0000 Subject: [PATCH 04/12] fix --- Jenkinsfile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index af4411bb57..3f2d277ce6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -272,6 +272,7 @@ pipeline { agent { label "linux-ci" } environment { GIT_CACHE_PATH = "${HOME}/cache" + NO_AUTH_BOTO_CONFIG = "/home/ubuntu/.boto" } stages { stage("checkout") { @@ -318,6 +319,12 @@ pipeline { } steps { sh """ +cat > /home/ubuntu/.boto < /home/ubuntu/squid.conf < Date: Mon, 6 Jan 2020 12:21:56 +0000 Subject: [PATCH 05/12] fix --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3f2d277ce6..523793f917 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -358,7 +358,7 @@ EOL # docker run --name squid -d --rm --publish 3128:3128 --mount type=bind,source=sq,target=/etc/squid sameersbn/squid # docker run --name squid -d -p 3128:3128 --volume ~/squid:/var/spool/squid datadog/squid rm -rf src/brave - HTTP_PROXY=http://127.0.0.1:3128 HTTPS_PROXY=http://127.0.0.1:3128 npm run init + http_proxy=http://127.0.0.1:3128 https_proxy=http://127.0.0.1:3128 HTTP_PROXY=http://127.0.0.1:3128 HTTPS_PROXY=http://127.0.0.1:3128 npm run init """ } } From 30eab57a30c4d524c56f80b3d9c83ca88c6f4e0a Mon Sep 17 00:00:00 2001 From: Mihai Plesa Date: Sat, 7 Mar 2020 21:52:16 +0000 Subject: [PATCH 06/12] fix --- Jenkinsfile | 40 ++++++++++++++-------------------------- 1 file changed, 14 insertions(+), 26 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 523793f917..b002e98818 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -319,44 +319,32 @@ pipeline { } steps { sh """ + sudo DEBIAN_FRONTEND=noninteractive apt-install -q update + sudo DEBIAN_FRONTEND=noninteractive apt-install -q -y install squid + cat > /home/ubuntu/.boto < /home/ubuntu/squid.conf < /etc/squid/squid.conf < Date: Sat, 7 Mar 2020 22:09:09 +0000 Subject: [PATCH 07/12] fix --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index b002e98818..7a3d0f8895 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -338,7 +338,7 @@ quick_abort_min -1 KB maximum_object_size 1024 MB refresh_pattern ^ftp: 1440 20% 10080 refresh_pattern ^gopher: 1440 0% 1440 -refresh_pattern -i (/cgi-bin/|\?) 0 0% 0 +refresh_pattern -i (/cgi-bin/|\\?) 0 0% 0 refresh_pattern -i .(deb|rpm|exe|zip|tar|tgz|bz2|gz)$ 10080 90% 43200 override-expire ignore-no-cache ignore-no-store ignore-private refresh_pattern . 0 40% 40320 refresh_all_ims on From ae8a65696c48af446654df816c140f0e28f0ba1a Mon Sep 17 00:00:00 2001 From: Mihai Plesa Date: Sat, 7 Mar 2020 22:10:01 +0000 Subject: [PATCH 08/12] fix --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7a3d0f8895..9d28ab78e1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -339,7 +339,7 @@ maximum_object_size 1024 MB refresh_pattern ^ftp: 1440 20% 10080 refresh_pattern ^gopher: 1440 0% 1440 refresh_pattern -i (/cgi-bin/|\\?) 0 0% 0 -refresh_pattern -i .(deb|rpm|exe|zip|tar|tgz|bz2|gz)$ 10080 90% 43200 override-expire ignore-no-cache ignore-no-store ignore-private +refresh_pattern -i .(deb|rpm|exe|zip|tar|tgz|bz2|gz)\$ 10080 90% 43200 override-expire ignore-no-cache ignore-no-store ignore-private refresh_pattern . 0 40% 40320 refresh_all_ims on EOL From b140ef248fdc67c464ca64312fb117f339df0d52 Mon Sep 17 00:00:00 2001 From: Mihai Plesa Date: Sat, 7 Mar 2020 22:22:41 +0000 Subject: [PATCH 09/12] fix --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9d28ab78e1..e237f51459 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -319,8 +319,8 @@ pipeline { } steps { sh """ - sudo DEBIAN_FRONTEND=noninteractive apt-install -q update - sudo DEBIAN_FRONTEND=noninteractive apt-install -q -y install squid + sudo DEBIAN_FRONTEND=noninteractive apt-get -q update + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install squid cat > /home/ubuntu/.boto < Date: Sat, 7 Mar 2020 22:28:45 +0000 Subject: [PATCH 10/12] fix --- Jenkinsfile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e237f51459..dce01cc28c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -322,14 +322,13 @@ pipeline { sudo DEBIAN_FRONTEND=noninteractive apt-get -q update sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install squid -cat > /home/ubuntu/.boto < /home/ubuntu/.boto < /etc/squid/squid.conf < Date: Sat, 7 Mar 2020 22:38:16 +0000 Subject: [PATCH 11/12] fix --- Jenkinsfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index dce01cc28c..119f80cb3e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -342,7 +342,9 @@ refresh_pattern -i .(deb|rpm|exe|zip|tar|tgz|bz2|gz)\$ 10080 90% 43200 override- refresh_pattern . 0 40% 40320 refresh_all_ims on" | sudo tee /etc/squid/squid.conf - service squid restart + mkdir /home/ubuntu/squid || true + chmod -R 777 /home/ubuntu/squid + sudo service squid restart rm -rf src/brave http_proxy=http://127.0.0.1:3128 https_proxy=http://127.0.0.1:3128 HTTP_PROXY=http://127.0.0.1:3128 HTTPS_PROXY=http://127.0.0.1:3128 npm run init """ From f9d0c29a5e8af8cc08d27036d6cf2ad9259c06cc Mon Sep 17 00:00:00 2001 From: Mihai Plesa Date: Sat, 7 Mar 2020 22:49:29 +0000 Subject: [PATCH 12/12] fix --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 119f80cb3e..d846f60f70 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -343,7 +343,7 @@ refresh_pattern . 0 40% 40320 refresh_all_ims on" | sudo tee /etc/squid/squid.conf mkdir /home/ubuntu/squid || true - chmod -R 777 /home/ubuntu/squid + sudo chmod -R 777 /home/ubuntu/squid sudo service squid restart rm -rf src/brave http_proxy=http://127.0.0.1:3128 https_proxy=http://127.0.0.1:3128 HTTP_PROXY=http://127.0.0.1:3128 HTTPS_PROXY=http://127.0.0.1:3128 npm run init