Signed-off-by: Liu Yinsi liuyinsi@163.com --- sparrow/0-package/common | 1 + sparrow/1-storage/permission | 2 ++ sparrow/1-storage/tiny | 3 +++ sparrow/3-code/dev-env | 1 + 4 files changed, 7 insertions(+)

diff --git a/sparrow/0-package/common b/sparrow/0-package/common index 74905f1..b381d73 100755 --- a/sparrow/0-package/common +++ b/sparrow/0-package/common @@ -5,6 +5,7 @@ gem install git activesupport rest-client cucumber json faye-websocket elasticsearch

grep -q '^lkp:' /etc/passwd || useradd -u 1090 lkp +grep -q '^mailer:' /etc/passwd || useradd -u 1144 mailer grep -q '^team:' /etc/group || groupadd team grep -q '^committer:' /etc/group || groupadd -g 1999 committer

diff --git a/sparrow/1-storage/permission b/sparrow/1-storage/permission index f5c1646..d1367cf 100755 --- a/sparrow/1-storage/permission +++ b/sparrow/1-storage/permission @@ -3,6 +3,7 @@ chown lkp:lkp /srv/result chown lkp:lkp /srv/initrd chown -R lkp:lkp /srv/es +chown -R mailer:team /srv/cci/Maildir chown lkp:lkp /srv/cache/netdata_cache chown lkp:lkp /srv/cache/netdata_lib chown lkp:lkp /srv/cci/serial/fluentd-pos @@ -15,6 +16,7 @@ chmod 775 /srv/cache/netdata_cache chmod 775 /srv/cache/netdata_lib chmod 775 /srv/cci/serial/logs chmod 775 /srv/cci/serial/fluentd-pos +chmod -R 775 /srv/cci/Maildir

chgrp team /srv/dc chmod g+ws /srv/dc diff --git a/sparrow/1-storage/tiny b/sparrow/1-storage/tiny index 21c2720..e589937 100755 --- a/sparrow/1-storage/tiny +++ b/sparrow/1-storage/tiny @@ -20,6 +20,9 @@ dirs=( /tftpboot /c /etc/qemu + /srv/cci/Maildir/.compass-ci/new + /srv/cci/Maildir/.compass-ci/cur + /srv/cci/Maildir/.compass-ci/sent )

mkdir -p "${dirs[@]}" diff --git a/sparrow/3-code/dev-env b/sparrow/3-code/dev-env index 34cbe17..fb16000 100755 --- a/sparrow/3-code/dev-env +++ b/sparrow/3-code/dev-env @@ -38,6 +38,7 @@ LOGGING_ES_PORT: $LOGGING_ES_PORT SEND_MAIL_PORT: $SEND_MAIL_PORT LOCAL_SEND_MAIL_PORT: $LOCAL_SEND_MAIL_PORT LOCAL_ROBOT_EMAIL_ADDRESS: $LOCAL_ROBOT_EMAIL_ADDRESS +MAILDIR: /srv/cci/Maildir/.compass-ci EOF

cat > /etc/profile.d/compass.sh <<'EOF'