buildmaster/tools: check for confdir, error on missing. Add tools to path

kallisti5 · kallisti5 · commit 01f037178372 · 2021-10-14T09:03:08.000-05:00
diff --git a/buildmaster/bin/builderctl b/buildmaster/bin/builderctl
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 #
-# Copyright 2016-2017 Haiku, Inc. All rights reserved.
+# Copyright 2016-2021 Haiku, Inc. All rights reserved.
 # Distributed under the terms of the MIT License.
 #
 # Authors:
@@ -159,6 +159,11 @@ parser.add_argument('-C', '--confdir', help='Builder config directory on local m
 parser.add_argument('action', help='[ health | provision | reboot ]')
 args = parser.parse_args()
 
+if not os.path.isdir(args.confdir):
+	print("Error: Builder inventory not found!")
+	print("Please change to haikuports directory before running this tool (or pass --confdir)!")
+	sys.exit()
+
 if args.action == "health":
 	cluster_health(args)
 elif args.action == "provision":
diff --git a/buildmaster/bin/builderssh b/buildmaster/bin/builderssh
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 #
-# Copyright 2016-2017 Haiku, Inc. All rights reserved.
+# Copyright 2016-2021 Haiku, Inc. All rights reserved.
 # Distributed under the terms of the MIT License.
 #
 # Authors:
@@ -49,4 +49,10 @@ parser = argparse.ArgumentParser(description='Open SSH connection to builder')
 parser.add_argument('-C', '--confdir', help='Builder config directory on local machine', required=False, default=os.path.join(os.getcwd(), "buildmaster/builders"))
 parser.add_argument('buildername', help='Name of builder')
 args = parser.parse_args()
+
+if not os.path.isdir(args.confdir):
+	print("Error: Builder inventory not found!");
+	print("Please change to haikuports directory before running this tool (or pass --confdir)!")
+	sys.exit()
+
 launch_ssh(args)
diff --git a/buildmaster/bin/createbuilder b/buildmaster/bin/createbuilder
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# Copyright 2016-2017 Haiku, Inc. All rights reserved.
+# Copyright 2016-2021 Haiku, Inc. All rights reserved.
 # Distributed under the terms of the MIT License.
 #
 # Authors:
@@ -25,6 +25,11 @@ parser.add_argument('-f', '--force', help='Force overwrite of existing builder',
 parser.add_argument('-w', '--workdir', help='Haikuports path on remote builder', required=False, default="/boot/home/haikuports")
 args = parser.parse_args()
 
+if not os.path.isdir(args.confdir):
+	print("Error: Builder inventory not found!")
+	print("Please change to haikuports directory before running this tool (or pass --confdir)!")
+	sys.exit()
+
 if not os.path.isdir(args.confdir):
 	os.mkdir(args.confdir, 0755)
 
diff --git a/buildmaster/docker/Dockerfile b/buildmaster/docker/Dockerfile
@@ -7,6 +7,7 @@ RUN apt-get update \
 	&& apt-get clean
 
 RUN mkdir /var/sources /var/buildmaster
+RUN echo 'export PATH=$PATH:/var/sources/haikuporter/buildmaster/bin/' >> /etc/bash.bashrc
 
 VOLUME ["/var/sources", "/var/buildmaster"]
 
diff --git a/buildmaster/docker/Makefile b/buildmaster/docker/Makefile
@@ -0,0 +1,4 @@
+default:
+	docker build --no-cache --tag docker.io/haikuporter/buildmaster:1.2.5 .
+push:
+	docker push docker.io/haikuporter/buildmaster:1.2.5
