| 1 |
commit: dcb7a06231e1c51664c529b1aa651395908fb498 |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed May 13 20:46:40 2020 +0000 |
| 4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 13 20:46:40 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcb7a062 |
| 7 |
|
| 8 |
dev-util/buildbot-worker: Set correct permissions in pkg_config |
| 9 |
|
| 10 |
Update buildbot.tac.sample to match current master.cfg.sample settings. |
| 11 |
This allows for the worker to connect to the hello-world sample bot properly |
| 12 |
provided it is on the same host as the master. |
| 13 |
|
| 14 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
| 15 |
Signed-off-by: Brian Dolbec <dolsen <AT> gentoo.org> |
| 16 |
|
| 17 |
dev-util/buildbot-worker/buildbot-worker-2.7.0.ebuild | 4 +++- |
| 18 |
dev-util/buildbot-worker/buildbot-worker-9999.ebuild | 4 +++- |
| 19 |
dev-util/buildbot-worker/files/buildbot.tac.sample | 6 +++--- |
| 20 |
3 files changed, 9 insertions(+), 5 deletions(-) |
| 21 |
|
| 22 |
diff --git a/dev-util/buildbot-worker/buildbot-worker-2.7.0.ebuild b/dev-util/buildbot-worker/buildbot-worker-2.7.0.ebuild |
| 23 |
index 4c141f7b354..be5258cd998 100644 |
| 24 |
--- a/dev-util/buildbot-worker/buildbot-worker-2.7.0.ebuild |
| 25 |
+++ b/dev-util/buildbot-worker/buildbot-worker-2.7.0.ebuild |
| 26 |
@@ -114,7 +114,7 @@ pkg_config() { |
| 27 |
if [[ ! -d "${instance_path}" ]]; then |
| 28 |
mkdir --parents "${instance_path}" || die "Unable to create directory ${buildworker_path}" |
| 29 |
fi |
| 30 |
- chown --recursive buildbot "${instance_path}" || die "Setting permissions for instance failed" |
| 31 |
+ chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed" |
| 32 |
cp "${buildworker_path}/buildbot.tac.sample" "${instance_path}/buildbot.tac" \ |
| 33 |
|| die "Moving sample configuration failed" |
| 34 |
ln --symbolic --relative "/etc/init.d/buildbot_worker" "/etc/init.d/buildbot_worker.${instance_name}" \ |
| 35 |
@@ -122,6 +122,8 @@ pkg_config() { |
| 36 |
|
| 37 |
if [[ ! -d "${instance_log_path}" ]]; then |
| 38 |
mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}" |
| 39 |
+ chown --recursive buildbot:buildbot "${instance_log_path}" \ |
| 40 |
+ || die "Setting permissions for instance failed" |
| 41 |
fi |
| 42 |
ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \ |
| 43 |
|| die "Unable to create link to log file" |
| 44 |
|
| 45 |
diff --git a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild |
| 46 |
index 4c141f7b354..be5258cd998 100644 |
| 47 |
--- a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild |
| 48 |
+++ b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild |
| 49 |
@@ -114,7 +114,7 @@ pkg_config() { |
| 50 |
if [[ ! -d "${instance_path}" ]]; then |
| 51 |
mkdir --parents "${instance_path}" || die "Unable to create directory ${buildworker_path}" |
| 52 |
fi |
| 53 |
- chown --recursive buildbot "${instance_path}" || die "Setting permissions for instance failed" |
| 54 |
+ chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed" |
| 55 |
cp "${buildworker_path}/buildbot.tac.sample" "${instance_path}/buildbot.tac" \ |
| 56 |
|| die "Moving sample configuration failed" |
| 57 |
ln --symbolic --relative "/etc/init.d/buildbot_worker" "/etc/init.d/buildbot_worker.${instance_name}" \ |
| 58 |
@@ -122,6 +122,8 @@ pkg_config() { |
| 59 |
|
| 60 |
if [[ ! -d "${instance_log_path}" ]]; then |
| 61 |
mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}" |
| 62 |
+ chown --recursive buildbot:buildbot "${instance_log_path}" \ |
| 63 |
+ || die "Setting permissions for instance failed" |
| 64 |
fi |
| 65 |
ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \ |
| 66 |
|| die "Unable to create link to log file" |
| 67 |
|
| 68 |
diff --git a/dev-util/buildbot-worker/files/buildbot.tac.sample b/dev-util/buildbot-worker/files/buildbot.tac.sample |
| 69 |
index ee3d7ca3cef..19bd941911b 100644 |
| 70 |
--- a/dev-util/buildbot-worker/files/buildbot.tac.sample |
| 71 |
+++ b/dev-util/buildbot-worker/files/buildbot.tac.sample |
| 72 |
@@ -29,9 +29,9 @@ maxRotatedFiles = 10 |
| 73 |
port = 9989 |
| 74 |
|
| 75 |
# worker settings |
| 76 |
-worker_name = 'worker-1' |
| 77 |
-passwd = 'mypasswd' |
| 78 |
-buildmaster_host = 'mybuildbot.foobar.org' |
| 79 |
+worker_name = 'example-worker' |
| 80 |
+passwd = 'pass' |
| 81 |
+buildmaster_host = 'localhost' |
| 82 |
keepalive = 600 |
| 83 |
umask = None |
| 84 |
maxdelay = 300 |
Archives