Merge lp:~milo/linaro-android-gerrit-support/fix-paths into lp:linaro-android-gerrit-support

Proposed by Milo Casagrande
Status: Merged
Merged at revision: 87
Proposed branch: lp:~milo/linaro-android-gerrit-support/fix-paths
Merge into: lp:linaro-android-gerrit-support
Diff against target: 29 lines (+5/-3)
2 files modified
android.git.linaro.org/create-new-projects.sh (+2/-1)
android.git.linaro.org/cron-runner.sh (+3/-2)
To merge this branch: bzr merge lp:~milo/linaro-android-gerrit-support/fix-paths
Reviewer Review Type Date Requested Status
Paul Sokolovsky Approve
Linaro Automation & Validation Pending
Review via email: mp+164406@code.launchpad.net

Description of the change

Fix hardcoded paths due to new server layout.

To post a comment you must log in.
Revision history for this message
Paul Sokolovsky (pfalcon) wrote :

Looks good, sure.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'android.git.linaro.org/create-new-projects.sh'
2--- android.git.linaro.org/create-new-projects.sh 2012-05-03 16:26:22 +0000
3+++ android.git.linaro.org/create-new-projects.sh 2013-05-17 14:00:34 +0000
4@@ -4,7 +4,8 @@
5 # This script is intended to be run as a cronjob.
6 #
7
8-MIRROR_DIR=/srv/build_engineer_scratch/gerrit-mirror
9+BASE_DIR=/mnt/linaro-android-gerrit-support
10+MIRROR_DIR=$BASE_DIR/gerrit-mirror
11
12 MANIFEST="http://android.git.linaro.org/gitweb?p=platform/manifest.git;a=blob_plain;f=default.xml;hb=HEAD"
13 #MANIFEST="http://android.git.linaro.org/gitweb?p=platform/manifest.git;a=blob_plain;f=default.xml;hb=refs/heads/linaro_android_4.0.3"
14
15=== modified file 'android.git.linaro.org/cron-runner.sh'
16--- android.git.linaro.org/cron-runner.sh 2011-12-08 16:45:41 +0000
17+++ android.git.linaro.org/cron-runner.sh 2013-05-17 14:00:34 +0000
18@@ -1,8 +1,9 @@
19 #!/bin/bash
20 # This script is intended to be run from crontab
21
22-MIRROR_DIR=/srv/build_engineer_scratch/gerrit-mirror/
23-LOG_DIR=/srv/build_engineer_scratch/gerrit-mirror-logs/
24+BASE_DIR=/mnt/linaro-android-gerrit-support
25+MIRROR_DIR=$BASE_DIR/gerrit-mirror/
26+LOG_DIR=$BASE_DIR/gerrit-mirror-logs/
27
28 TSTAMP=`date '+%Y%m%dT%H%M'`
29 MYPATH=.

Subscribers

People subscribed via source and target branches