Commit 90fbaf7b authored by Eteri's avatar Eteri

fix caddy

parent 83e62d7e
...@@ -94,7 +94,7 @@ def main(): ...@@ -94,7 +94,7 @@ def main():
help='The Url of Master controling many suites', help='The Url of Master controling many suites',
default=None) default=None)
testList=["/srv/slapgrid/slappart0/srv/runner/project/slapos/software/fluentTest/testIngestion.py"] testList=["estIngestion.py"]
args = parser.parse_args() args = parser.parse_args()
master = taskdistribution.TaskDistributor(args.master_url) master = taskdistribution.TaskDistributor(args.master_url)
......
...@@ -8,10 +8,13 @@ extends = ...@@ -8,10 +8,13 @@ extends =
parts = parts =
slapos-cookbook slapos-cookbook
eggs eggs
caddy
fluentd fluentd
instance-profile instance-profile
template-runTestSuite template-runTestSuite
template-fluentdConfig template-fluentdConfig
[instance-profile] [instance-profile]
recipe = slapos.recipe.template recipe = slapos.recipe.template
...@@ -68,3 +71,15 @@ url = ${:_profile_base_location_}/instance-caddy-fluentd.cfg.in ...@@ -68,3 +71,15 @@ url = ${:_profile_base_location_}/instance-caddy-fluentd.cfg.in
md5sum = 33652e8cdbf244911fc861c901a10af4 md5sum = 33652e8cdbf244911fc861c901a10af4
output = ${buildout:directory}/instance-caddy-fluentd.cfg.in output = ${buildout:directory}/instance-caddy-fluentd.cfg.in
mode = 0644 mode = 0644
[caddy]
recipe = slapos.recipe.cmmi
path = ${go_github.com_mholt_caddy:location}
go = ${gowork:golang}/bin/go
configure-command = :
make-targets =
make-binary = cd ${:path}/caddy && ${:go} install -v
environment =
PATH=${pkgconfig:location}/bin:${gowork:golang}/bin:${buildout:bin-directory}:%(PATH)s
GOPATH=${gowork:directory}
output = ${gowork:bin}/caddy
...@@ -22,6 +22,6 @@ class TestPost(unittest.TestCase): ...@@ -22,6 +22,6 @@ class TestPost(unittest.TestCase):
if __name__ == "__main__": if __name__ == "__main__":
#unittest.main() unittest.main()
suite = unittest.TestLoader().loadTestsFromTestCase(TestPost) suite = unittest.TestLoader().loadTestsFromTestCase(TestPost)
unittest.TextTestRunner(verbosity=2).run(suite) unittest.TextTestRunner(verbosity=2).run(suite)
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment