slapos-sr-testing: Use slapos.core from the repository

The test system requires to adapt to changes in slapos.core rapidly,
and so it has use the most recent version.

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_file_list_log-CADDY.txt

@@ -2,6 +2,7 @@ T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
 T-1/var/log/kedfia.log
+T-1/var/log/monitor-httpd-error.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
 T-2/var/log/httpd-cache-direct/_dummy-cached_access_log

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_file_list_run-CADDY.txt

 T-0/var/run/monitor-httpd.pid
 T-0/var/run/monitor/monitor-bootstrap.pid
 T-1/var/run/kedifa.pid
+T-1/var/run/monitor-httpd.pid
 T-1/var/run/monitor/monitor-bootstrap.pid
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_file_list_log-CADDY.txt

@@ -2,6 +2,7 @@ T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
 T-1/var/log/kedfia.log
+T-1/var/log/monitor-httpd-error.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
 T-2/var/log/httpd-cache-direct/_dummy-cached_access_log

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_file_list_run-CADDY.txt

 T-0/var/run/monitor-httpd.pid
 T-0/var/run/monitor/monitor-bootstrap.pid
 T-1/var/run/kedifa.pid
+T-1/var/run/monitor-httpd.pid
 T-1/var/run/monitor/monitor-bootstrap.pid
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_file_list_log-CADDY.txt

@@ -2,6 +2,7 @@ T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
 T-1/var/log/kedfia.log
+T-1/var/log/monitor-httpd-error.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
 T-2/var/log/httpd-cache-direct/_dummy-cached_access_log

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_file_list_run-CADDY.txt

 T-0/var/run/monitor-httpd.pid
 T-0/var/run/monitor/monitor-bootstrap.pid
 T-1/var/run/kedifa.pid
+T-1/var/run/monitor-httpd.pid
 T-1/var/run/monitor/monitor-bootstrap.pid
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_file_list_log-CADDY.txt

@@ -2,6 +2,7 @@ T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
 T-1/var/log/kedfia.log
+T-1/var/log/monitor-httpd-error.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
 T-2/var/log/httpd-cache-direct/_dummy-cached_access_log

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_file_list_run-CADDY.txt

 T-0/var/run/monitor-httpd.pid
 T-0/var/run/monitor/monitor-bootstrap.pid
 T-1/var/run/kedifa.pid
+T-1/var/run/monitor-httpd.pid
 T-1/var/run/monitor/monitor-bootstrap.pid
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid

software/caddy-frontend/test/test_data/test.TestMasterRequest.test_file_list_etc_cron_d-CADDY.txt

@@ -5,4 +5,9 @@ T-0/etc/cron.d/monitor_collect
 T-1/etc/cron.d/logrotate
 T-1/etc/cron.d/monitor-configurator
 T-1/etc/cron.d/monitor-globalstate
-T-1/etc/cron.d/monitor_collect
\ No newline at end of file
+T-1/etc/cron.d/monitor_collect
+T-2/etc/cron.d/logrotate
+T-2/etc/cron.d/monitor-configurator
+T-2/etc/cron.d/monitor-globalstate
+T-2/etc/cron.d/monitor_collect
+T-2/etc/cron.d/trafficserver-logrotate
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestMasterRequest.test_file_list_log-CADDY.txt

 T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
-T-1/var/log/kedfia.log
\ No newline at end of file
+T-1/var/log/kedfia.log
+T-1/var/log/monitor-httpd-error.log
+T-2/var/log/frontend-access.log
+T-2/var/log/frontend-error.log
+T-2/var/log/httpd-cache-direct/_waitforcaddyslave_access_log
+T-2/var/log/httpd-cache-direct/_waitforcaddyslave_error_log
+T-2/var/log/httpd-csr_id/expose-csr_id.log
+T-2/var/log/httpd/_waitforcaddyslave_access_log
+T-2/var/log/httpd/_waitforcaddyslave_error_log
+T-2/var/log/trafficserver/manager.log
+T-2/var/log/trafficserver/traffic.out
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestMasterRequest.test_file_list_run-CADDY.txt

 T-0/var/run/monitor-httpd.pid
 T-0/var/run/monitor/monitor-bootstrap.pid
 T-1/var/run/kedifa.pid
-T-1/var/run/monitor/monitor-bootstrap.pid
\ No newline at end of file
+T-1/var/run/monitor-httpd.pid
+T-1/var/run/monitor/monitor-bootstrap.pid
+T-2/var/run/graceful_configuration_state_signature
+T-2/var/run/httpd.pid
+T-2/var/run/monitor/monitor-bootstrap.pid
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_file_list_etc_cron_d-CADDY.txt

@@ -5,4 +5,9 @@ T-0/etc/cron.d/monitor_collect
 T-1/etc/cron.d/logrotate
 T-1/etc/cron.d/monitor-configurator
 T-1/etc/cron.d/monitor-globalstate
-T-1/etc/cron.d/monitor_collect
\ No newline at end of file
+T-1/etc/cron.d/monitor_collect
+T-2/etc/cron.d/logrotate
+T-2/etc/cron.d/monitor-configurator
+T-2/etc/cron.d/monitor-globalstate
+T-2/etc/cron.d/monitor_collect
+T-2/etc/cron.d/trafficserver-logrotate
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_file_list_log-CADDY.txt

 T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
-T-1/var/log/kedfia.log
\ No newline at end of file
+T-1/var/log/kedfia.log
+T-1/var/log/monitor-httpd-error.log
+T-2/var/log/frontend-access.log
+T-2/var/log/frontend-error.log
+T-2/var/log/httpd-cache-direct/_waitforcaddyslave_access_log
+T-2/var/log/httpd-cache-direct/_waitforcaddyslave_error_log
+T-2/var/log/httpd-csr_id/expose-csr_id.log
+T-2/var/log/httpd/_waitforcaddyslave_access_log
+T-2/var/log/httpd/_waitforcaddyslave_error_log
+T-2/var/log/trafficserver/manager.log
+T-2/var/log/trafficserver/traffic.out
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_file_list_run-CADDY.txt

 T-0/var/run/monitor-httpd.pid
 T-0/var/run/monitor/monitor-bootstrap.pid
 T-1/var/run/kedifa.pid
-T-1/var/run/monitor/monitor-bootstrap.pid
\ No newline at end of file
+T-1/var/run/monitor-httpd.pid
+T-1/var/run/monitor/monitor-bootstrap.pid
+T-2/var/run/graceful_configuration_state_signature
+T-2/var/run/httpd.pid
+T-2/var/run/monitor/monitor-bootstrap.pid
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_file_list_log-CADDY.txt

@@ -2,6 +2,7 @@ T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
 T-1/var/log/kedfia.log
+T-1/var/log/monitor-httpd-error.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
 T-2/var/log/httpd-cache-direct/_url_access_log

software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_file_list_run-CADDY.txt

 T-0/var/run/monitor-httpd.pid
 T-0/var/run/monitor/monitor-bootstrap.pid
 T-1/var/run/kedifa.pid
+T-1/var/run/monitor-httpd.pid
 T-1/var/run/monitor/monitor-bootstrap.pid
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid

software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_file_list_log-CADDY.txt

@@ -2,8 +2,11 @@ T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
 T-1/var/log/kedfia.log
+T-1/var/log/monitor-httpd-error.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
+T-2/var/log/httpd-cache-direct/_default_access_log
+T-2/var/log/httpd-cache-direct/_default_error_log
 T-2/var/log/httpd-csr_id/expose-csr_id.log
 T-2/var/log/httpd/_default_access_log
 T-2/var/log/httpd/_default_error_log

software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_file_list_run-CADDY.txt

 T-0/var/run/monitor-httpd.pid
 T-0/var/run/monitor/monitor-bootstrap.pid
 T-1/var/run/kedifa.pid
+T-1/var/run/monitor-httpd.pid
 T-1/var/run/monitor/monitor-bootstrap.pid
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid
 T-2/var/run/monitor-httpd.pid
-T-2/var/run/monitor/monitor-bootstrap.pid
+T-2/var/run/monitor/monitor-bootstrap.pid
\ No newline at end of file

software/slapos-sr-testing/software.cfg

@@ -15,8 +15,8 @@ extends =
   ./buildout.hash.cfg
 
 parts =
-  slapos-cookbook
   eggs
+  slapos-cookbook
   template
 
 [setup-develop-egg]
@@ -102,16 +102,27 @@ setup = ${slapos-repository:location}/software/nextcloud/test/
 egg = slapos.test.nextcloud
 setup = ${slapos-repository:location}/software/turnserver/test/
 
+[slapos.core-repository]
+<= git-clone-repository
+repository = https://lab.nexedi.com/master/slapos.core.git
+branch = master
+
+[slapos.core-setup]
+<= setup-develop-egg
+egg = slapos.core
+setup = ${slapos.core-repository:location}
+
 [eggs]
 recipe = zc.recipe.egg
 eggs =
+  ${lxml-python:egg}
+  ${slapos.core-setup:egg}
   ${pillow-python:egg}
   erp5.util
   ${python-pynacl:egg}
   ${python-cryptography:egg}
   ${bcrypt:egg}
   slapos.libnetworkcache
-  slapos.core
   supervisor
   ${slapos.cookbook-setup:egg}
   ${slapos.test.caddy-frontend-setup:egg}
@@ -156,6 +167,8 @@ output = ${buildout:directory}/template.cfg
 mode = 640
 
 [versions]
+# slapos.core is used from the clone always
+slapos.core =
 # Various needed versions
 Pillow = 5.3.0
 PyNaCl = 1.3.0