CMakeModules/testing_go.cmake

@@ -11,7 +11,7 @@ endif ()
 
 function(gotest target source_dir test_source_files)
     if (BUILD_TESTS)
-                add_test(NAME test-${target} COMMAND go test ${test_source_files}
+                add_test(NAME test-${target} COMMAND go test -v ${test_source_files}
                 WORKING_DIRECTORY ${source_dir})
         set_tests_properties(test-${target} PROPERTIES LABELS "unit;all")
         message(STATUS "Added test 'test-${target}'")

broker/src/asapo_broker/server/process_request_test.go

@@ -9,6 +9,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/suite"
+	"fmt"
 	"io"
 	"net/http"
 	"net/http/httptest"
@@ -105,6 +106,8 @@ func doRequest(path string, extra_params ...string) *httptest.ResponseRecorder {
 
 	mux := utils.NewRouter(listRoutes)
 	req, _ := http.NewRequest(m, ver+path, body)
+	fmt.Print("    req=")
+	fmt.Println(req)
 	w := httptest.NewRecorder()
 	mux.ServeHTTP(w, req)
 	return w

deploy/build_env/services-linux/run_asapo.sh

-cp build/authorizer/asapo-authorizer /asapo-authorizer
-cp build/discovery/asapo-discovery /asapo-discovery
-cp build/broker/asapo-broker /asapo-broker
-cp build/file_transfer/asapo-file-transfer  /asapo-file-transfer
-cp build/receiver/receiver /receiver
-cp build/monitoring/monitoring_server/asapo-monitoring-server /asapo-monitoring-server
+#!/bin/bash
 
+build_dir="${1:-build}"
+script_dir="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+root_dir="$script_dir/../../.."
 
-cp deploy/asapo_services_light/*json /
-cp deploy/asapo_services_light/envoy.yaml /
+cp "$build_dir"/authorizer/asapo-authorizer /asapo-authorizer
+cp "$build_dir"/discovery/asapo-discovery /asapo-discovery
+cp "$build_dir"/broker/asapo-broker /asapo-broker
+cp "$build_dir"/file_transfer/asapo-file-transfer /asapo-file-transfer
+cp "$build_dir"/receiver/receiver /receiver
+cp "$build_dir"/monitoring/monitoring_server/asapo-monitoring-server /asapo-monitoring-server
+
+cp "$root_dir"/deploy/asapo_services_light/*json /
+cp "$root_dir"/deploy/asapo_services_light/envoy.yaml /
 
 # Several receiver configs (tcp and fabric) are required for tests
-cp deploy/asapo_services_light/receiver.json /receiver_tcp.json
-cp deploy/build_env/services-linux/receiver_fabric.json /
-cp deploy/build_env/services-linux/receiver_kafka.json /
+cp "$root_dir"/deploy/asapo_services_light/receiver.json /receiver_tcp.json
+cp "$root_dir"/deploy/build_env/services-linux/receiver_fabric.json /
+cp "$root_dir"/deploy/build_env/services-linux/receiver_kafka.json /
 
-cp deploy/build_env/services-linux/discovery.json /
-cp deploy/build_env/services-linux/*key /
-cp deploy/build_env/services-linux/supervisord.conf /etc/
+cp "$root_dir"/deploy/build_env/services-linux/discovery.json /
+cp "$root_dir"/deploy/build_env/services-linux/*key /
+cp "$root_dir"/deploy/build_env/services-linux/supervisord.conf /etc/
 
-cp build/deploy/asapo_services_light/nginx.conf /etc/nginx/nginx.conf
+cp "$build_dir"/deploy/asapo_services_light/nginx.conf /etc/nginx/nginx.conf
 
 service slapd start
 ldapadd -x -D "ou=rgy,o=desy,c=de" -f /etc/ldap/record.ldif -h localhost
@@ -26,4 +31,3 @@ ldapadd -x -D "ou=rgy,o=desy,c=de" -f /etc/ldap/record.ldif -h localhost
 cd / && supervisord --configuration /etc/supervisord.conf &
 sleep 20
 cd -
-

deploy/build_env/ubuntu/gitlab-ci-build-docker.yml

@@ -9,9 +9,11 @@ docker-create-asapo-packages-ubuntu1804-build-env:
   tags:
     - kubernetes-executor
   rules:
-    - changes:
-        - deploy/build_env/ubuntu/Dockerfile.gitlab.18.04
-      when: always
+    - if: $CI_COMMIT_BRANCH
+      changes:
+        compare_to: 'refs/heads/develop'
+        paths:
+          - deploy/build_env/ubuntu/Dockerfile.gitlab.18.04
     - when: never
 
 docker-create-asapo-packages-ubuntu2004-build-env:
@@ -25,7 +27,9 @@ docker-create-asapo-packages-ubuntu2004-build-env:
   tags:
     - kubernetes-executor
   rules:
-    - changes:
-        - deploy/build_env/ubuntu/Dockerfile.gitlab.20.04
-      when: always
+    - if: $CI_COMMIT_BRANCH
+      changes:
+        compare_to: 'refs/heads/develop'
+        paths:
+          - deploy/build_env/ubuntu/Dockerfile.gitlab.20.04
     - when: never

producer/event_monitor_producer/src/main_eventmon.cpp

@@ -105,7 +105,9 @@ int main (int argc, char* argv[]) {
     stop_signal = 0;
     std::signal(SIGINT, SignalHandler);
     std::signal(SIGTERM, SignalHandler);
-#if defined(__linux__) || defined (__APPLE__)
+#if defined(__linux__) || defined(__APPLE__)
+    // FIXME
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     siginterrupt(SIGINT, 1);
 #endif
 

tests/automatic/asapo_fabric/timeout_test.cpp

 #include <iostream>
 #include <future>
+#include <thread>
 #include "asapo/common/error.h"
 #include "asapo/logger/logger.h"
 #include <testing.h>