diff options
| author | Paul Sokolovsky <paul.sokolovsky@linaro.org> | 2013-11-26 00:48:40 +0200 |
|---|---|---|
| committer | Paul Sokolovsky <paul.sokolovsky@linaro.org> | 2013-11-26 00:48:40 +0200 |
| commit | 453644808e860c727e3cf7f1bac67c4094763390 (patch) | |
| tree | d5aa382a1989f928c3cc52e5627481c395647d14 /control | |
| parent | 4ed50ba5460696f28b03ba70446a362a3f48510f (diff) | |
android-build jenkins switched to port 8080 for consistency with other hosts.
Diffstat (limited to 'control')
| -rw-r--r-- | control/jenkins-config/hudson.tasks.Mailer.xml | 2 | ||||
| -rwxr-xr-x | control/setup-control-node | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/control/jenkins-config/hudson.tasks.Mailer.xml b/control/jenkins-config/hudson.tasks.Mailer.xml index ab32299..d5cb3bb 100644 --- a/control/jenkins-config/hudson.tasks.Mailer.xml +++ b/control/jenkins-config/hudson.tasks.Mailer.xml @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='UTF-8'?> <hudson.tasks.Mailer_-DescriptorImpl> - <hudsonUrl>http://localhost:9090/jenkins/</hudsonUrl> + <hudsonUrl>http://localhost:8080/jenkins/</hudsonUrl> <adminAddress>address not configured yet <nobody@nowhere></adminAddress> <useSsl>false</useSsl> <charset>UTF-8</charset> diff --git a/control/setup-control-node b/control/setup-control-node index 55894bd..b92a05d 100755 --- a/control/setup-control-node +++ b/control/setup-control-node @@ -36,7 +36,7 @@ sudo dpkg -i $(basename $JENKINS_DEB) || true # Make apt-get install missing dependencies sudo apt-get install -qq -f -sudo sed -i 's%HTTP_PORT=8080%HTTP_PORT=9090%' /etc/default/jenkins +#sudo sed -i 's%HTTP_PORT=8080%HTTP_PORT=9090%' /etc/default/jenkins sudo sed -i 's%JENKINS_ARGS="%&--prefix=/jenkins %' /etc/default/jenkins # Install predefined sparse Jenkins config sudo cp -rf $MYPATH/jenkins-config/* ~jenkins @@ -113,8 +113,8 @@ cat <<\EOF | sudo tee /etc/apache2/sites-available/android-build.linaro.org > /d RewriteRule ^/builds/~([a-z][-a-z0-9]+)/([-A-Za-z0-9_.]+)/lastSuccessful/output(.*) http://127.0.0.1:600/$1_$2/lastSuccessful/archive$3 [L,P] RewriteRule ^/mockup(.*) $1 [R=301] - ProxyPass /jenkins http://localhost:9090/jenkins - ProxyPassReverse /jenkins http://localhost:9090/jenkins + ProxyPass /jenkins http://localhost:8080/jenkins + ProxyPassReverse /jenkins http://localhost:8080/jenkins Alias /static /home/build-system-frontend/frontend/static Alias /3.3.0/build /home/build-system-frontend/yui/build |