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 | |
parent | 4ed50ba5460696f28b03ba70446a362a3f48510f (diff) |
android-build jenkins switched to port 8080 for consistency with other hosts.
-rw-r--r-- | control/jenkins-config/hudson.tasks.Mailer.xml | 2 | ||||
-rwxr-xr-x | control/setup-control-node | 6 | ||||
-rw-r--r-- | utils/diskspace/expire-builds.groovy | 2 | ||||
-rwxr-xr-x | utils/mangle-jobs/mangle-jobs | 2 |
4 files changed, 6 insertions, 6 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 diff --git a/utils/diskspace/expire-builds.groovy b/utils/diskspace/expire-builds.groovy index fc35135..5f7dcd7 100644 --- a/utils/diskspace/expire-builds.groovy +++ b/utils/diskspace/expire-builds.groovy @@ -4,7 +4,7 @@ // Run by going to https://android-build.linaro.org/jenkins/script // Or using: -// java -jar jenkins-cli.jar -s http://localhost:9090/jenkins/ -i <Jenkins API SSK key> groovy expire.groovy +// java -jar jenkins-cli.jar -s http://localhost:8080/jenkins/ -i <Jenkins API SSK key> groovy expire.groovy // This script is expected to run via cron for (job in hudson.model.Hudson.instance.items) { diff --git a/utils/mangle-jobs/mangle-jobs b/utils/mangle-jobs/mangle-jobs index 8ad5bbc..9c465e9 100755 --- a/utils/mangle-jobs/mangle-jobs +++ b/utils/mangle-jobs/mangle-jobs @@ -28,7 +28,7 @@ from lxml.etree import fromstring, tostring optparser = optparse.OptionParser(usage="%prog <mangle script>") -optparser.add_option("--url", default="http://localhost:9090/jenkins/", +optparser.add_option("--url", default="http://localhost:8080/jenkins/", help="Jenkins base url, default: %default") optparser.add_option("--user", help="Jenkins username") |