diff --git a/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 b/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 index 6dda96ee2f..937cffddb8 100644 --- a/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 +++ b/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 @@ -182,7 +182,7 @@ factory.addStep(FileUpload(slavesrc="/var/log/taskotron/taskotron.log", masterdest=Interpolate('{{ public_artifacts_dir }}/%(prop:uuid)s/taskotron.log'))) # change permissions for uuid dir on master to be accessible via http -factory.addStep(MasterShellCommand(command=["chmod", '-R', '0755', Interpolate('{{ public_artifacts_dir }}/%(prop:uuid)s/')])) +#factory.addStep(MasterShellCommand(command=["chmod", '-R', '0755', Interpolate('{{ public_artifacts_dir }}/%(prop:uuid)s/')])) {% else %} # capture the taskotron log diff --git a/roles/taskotron/buildslave-configure/templates/buildbot.tac.j2 b/roles/taskotron/buildslave-configure/templates/buildbot.tac.j2 index 7901989ab0..430336976e 100644 --- a/roles/taskotron/buildslave-configure/templates/buildbot.tac.j2 +++ b/roles/taskotron/buildslave-configure/templates/buildbot.tac.j2 @@ -52,7 +52,11 @@ passwd = '{{ qadevel_stg_buildslave_password }}' keepalive = 600 usepty = 0 +{% if deployment_type == 'dev' %} +umask = 022 +{% else %} umask = None +{% endif %} maxdelay = 300 s = BuildSlave(buildmaster_host, port, slavename, passwd, basedir,