Gitweb links:
...log
http://git.netsurf-browser.org/netsurf-wiki.git/shortlog/6f50fa1169888494aca906918be866a6de490943
...commit
http://git.netsurf-browser.org/netsurf-wiki.git/commit/6f50fa1169888494aca906918be866a6de490943
...tree
http://git.netsurf-browser.org/netsurf-wiki.git/tree/6f50fa1169888494aca906918be866a6de490943
The branch, master has been updated
via 6f50fa1169888494aca906918be866a6de490943 (commit)
from 234635f0310b5eadee2ba17e6fe885b735624c92 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf-wiki.git/commit/?id=6f50fa1169888494aca906918be866a6de490943
commit 6f50fa1169888494aca906918be866a6de490943
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
update for https transport
diff --git a/continuous_integration/debian_stretch_setup.mdwn
b/continuous_integration/debian_stretch_setup.mdwn
index c20abee..2333455 100644
--- a/continuous_integration/debian_stretch_setup.mdwn
+++ b/continuous_integration/debian_stretch_setup.mdwn
@@ -24,9 +24,8 @@ Once installed:
- install sudo package and add netsurf user to sudo group
- edit /etc/default/grub
-`GRUB_CMDLINE_LINUX="console=tty0 console=ttyS0,115200n8"`
-
-`# update-grub2`
+ GRUB_CMDLINE_LINUX="console=tty0 console=ttyS0,115200n8"
+ # update-grub2
### arm64 VDS install
@@ -286,50 +285,62 @@ fs root" is set to /var/lib/jenkins add variable
JENKINS\_HOME set to
Note: replace arm64 with architecture name as required (armhf etc.)
-When configuring a scaleway instance the "Launch method" should be set to
"start and stop this node on-demand" with the "Start script" set to `perl
/usr/bin/pscw.pl start netsurf-ciworker17` and "Stop script" set to `perl
/usr/bin/pscw.pl stop netsurf-ciworker17`. The Availability set to "Take this
slave on-line when in demand and off-line when idle" and "in demand delay" set
to 0 and "idle delay" set to 15. This will mean the node is turned off and not
charged for when idle.
+When configuring a scaleway instance the "Launch method" should be set
+to "start and stop this node on-demand" with the "Start script" set to
+`perl /usr/bin/pscw.pl start netsurf-ciworker17` and "Stop script" set
+to `perl /usr/bin/pscw.pl stop netsurf-ciworker17`. The Availability
+set to "Take this slave on-line when in demand and off-line when idle"
+and "in demand delay" set to 0 and "idle delay" set to 15. This will
+mean the node is turned off and not charged for when idle.
As superuser:
-- create jenkins user
+create jenkins user
-`adduser --system --group --home /var/lib/jenkins/ --disabled-login jenkins`
+ adduser --system --group --home /var/lib/jenkins/ --disabled-login jenkins
-- Add CI server repo to slave apt sources
+Install https transport
-`echo "deb
`[`http://ci.netsurf-browser.org/debian/`](http://ci.netsurf-browser.org/debian/)`
stretch/amd64/" >> /etc/apt/sources.list.d/netsurf-browser.list`
+ apt-get install apt-transport-https
-- update repos
+Add CI server repo to slave apt sources
-`apt-get update`
+ echo "deb https://ci.netsurf-browser.org/debian/ stretch/amd64/" >>
/etc/apt/sources.list.d/netsurf-browser.list
-- install ns-ci-worker package. accept the large package list and the
- unsigned package install for gcovr and ns-ci-slave
+update repos
-`apt-get install ns-ci-worker`
+ apt-getupdate
-- edit /etc/default/ns-ci-worker to set the correct url and secret parameters
-- ensure /opt is setup correctly to allow toolchains to be built on the node
+install ci worker package. accept the large package list and the
+ unsigned package install for gcovr and ns-ci-slave
-`mkdir -p /opt/netsurf`
-`chown jenkins:jenkins /opt/netsurf`
+ apt-get install ns-ci-worker
-- become jenkins user
+edit /etc/default/ns-ci-worker to set the correct url and secret parameters
-`su -s/bin/bash - jenkins`
+ensure /opt is setup correctly to allow toolchains to be built on the node
-- create ssh keypair (accept defaults - no password)
+ mkdir -p /opt/netsurf
+ chown jenkins:jenkins /opt/netsurf
-`ssh-keygen -t rsa -C "[email protected]"`
+become jenkins user
+
+ su -s/bin/bash - jenkins
+
+create ssh keypair (accept defaults - no password)
-- copy .ssh/id\_rsa.pub from worker to jenkins master node and append
+ ssh-keygen -t rsa -C "[email protected]"
+
+copy .ssh/id\_rsa.pub from worker to jenkins master node and append
to /home/netsurf/.ssh/authorized\_keys
-`scp /home/jenkins/.ssh/id_rsa.pub
[email protected]:nsciworker17_id_rsa.pub`
+ scp /home/jenkins/.ssh/id_rsa.pub
[email protected]:nsciworker12_id_rsa.pub
+
+exit jenkins user shell
-- exit jenkins user shell
-- start CI worker daemon
+start CI worker daemon
-`/etc/init.d/ns-ci-worker start`
+ /etc/init.d/ns-ci-worker start
-----------------------------------------------------------------------
Summary of changes:
continuous_integration/debian_stretch_setup.mdwn | 63 +++++++++++++---------
1 file changed, 37 insertions(+), 26 deletions(-)
diff --git a/continuous_integration/debian_stretch_setup.mdwn
b/continuous_integration/debian_stretch_setup.mdwn
index c20abee..2333455 100644
--- a/continuous_integration/debian_stretch_setup.mdwn
+++ b/continuous_integration/debian_stretch_setup.mdwn
@@ -24,9 +24,8 @@ Once installed:
- install sudo package and add netsurf user to sudo group
- edit /etc/default/grub
-`GRUB_CMDLINE_LINUX="console=tty0 console=ttyS0,115200n8"`
-
-`# update-grub2`
+ GRUB_CMDLINE_LINUX="console=tty0 console=ttyS0,115200n8"
+ # update-grub2
### arm64 VDS install
@@ -286,50 +285,62 @@ fs root" is set to /var/lib/jenkins add variable
JENKINS\_HOME set to
Note: replace arm64 with architecture name as required (armhf etc.)
-When configuring a scaleway instance the "Launch method" should be set to
"start and stop this node on-demand" with the "Start script" set to `perl
/usr/bin/pscw.pl start netsurf-ciworker17` and "Stop script" set to `perl
/usr/bin/pscw.pl stop netsurf-ciworker17`. The Availability set to "Take this
slave on-line when in demand and off-line when idle" and "in demand delay" set
to 0 and "idle delay" set to 15. This will mean the node is turned off and not
charged for when idle.
+When configuring a scaleway instance the "Launch method" should be set
+to "start and stop this node on-demand" with the "Start script" set to
+`perl /usr/bin/pscw.pl start netsurf-ciworker17` and "Stop script" set
+to `perl /usr/bin/pscw.pl stop netsurf-ciworker17`. The Availability
+set to "Take this slave on-line when in demand and off-line when idle"
+and "in demand delay" set to 0 and "idle delay" set to 15. This will
+mean the node is turned off and not charged for when idle.
As superuser:
-- create jenkins user
+create jenkins user
-`adduser --system --group --home /var/lib/jenkins/ --disabled-login jenkins`
+ adduser --system --group --home /var/lib/jenkins/ --disabled-login jenkins
-- Add CI server repo to slave apt sources
+Install https transport
-`echo "deb
`[`http://ci.netsurf-browser.org/debian/`](http://ci.netsurf-browser.org/debian/)`
stretch/amd64/" >> /etc/apt/sources.list.d/netsurf-browser.list`
+ apt-get install apt-transport-https
-- update repos
+Add CI server repo to slave apt sources
-`apt-get update`
+ echo "deb https://ci.netsurf-browser.org/debian/ stretch/amd64/" >>
/etc/apt/sources.list.d/netsurf-browser.list
-- install ns-ci-worker package. accept the large package list and the
- unsigned package install for gcovr and ns-ci-slave
+update repos
-`apt-get install ns-ci-worker`
+ apt-getupdate
-- edit /etc/default/ns-ci-worker to set the correct url and secret parameters
-- ensure /opt is setup correctly to allow toolchains to be built on the node
+install ci worker package. accept the large package list and the
+ unsigned package install for gcovr and ns-ci-slave
-`mkdir -p /opt/netsurf`
-`chown jenkins:jenkins /opt/netsurf`
+ apt-get install ns-ci-worker
-- become jenkins user
+edit /etc/default/ns-ci-worker to set the correct url and secret parameters
-`su -s/bin/bash - jenkins`
+ensure /opt is setup correctly to allow toolchains to be built on the node
-- create ssh keypair (accept defaults - no password)
+ mkdir -p /opt/netsurf
+ chown jenkins:jenkins /opt/netsurf
-`ssh-keygen -t rsa -C "[email protected]"`
+become jenkins user
+
+ su -s/bin/bash - jenkins
+
+create ssh keypair (accept defaults - no password)
-- copy .ssh/id\_rsa.pub from worker to jenkins master node and append
+ ssh-keygen -t rsa -C "[email protected]"
+
+copy .ssh/id\_rsa.pub from worker to jenkins master node and append
to /home/netsurf/.ssh/authorized\_keys
-`scp /home/jenkins/.ssh/id_rsa.pub
[email protected]:nsciworker17_id_rsa.pub`
+ scp /home/jenkins/.ssh/id_rsa.pub
[email protected]:nsciworker12_id_rsa.pub
+
+exit jenkins user shell
-- exit jenkins user shell
-- start CI worker daemon
+start CI worker daemon
-`/etc/init.d/ns-ci-worker start`
+ /etc/init.d/ns-ci-worker start
--
NetSurf Developer Wiki Backing Store
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
