Seebees/instruction files

.github/workflows/test.yml

@@ -41,16 +41,6 @@ jobs:
           git config --global credential.helper store
           echo "https://x-token-auth:${{ secrets.PAT_FOR_PRIVATE_RUBY }}@github.com" > ~/.git-credentials
 
-      - name: Cache git submodules
-        uses: actions/cache@v4
-        with:
-          path: |
-            .git/modules
-            test-server/*/.git
-          key: ${{ runner.os }}-submodules-${{ hashFiles('.gitmodules') }}
-          restore-keys: |
-            ${{ runner.os }}-submodules-
-
       - name: Optimize git for performance
         run: |
           git config --global fetch.parallel ${{ steps.cpu-count.outputs.count }}
@@ -59,13 +49,12 @@ jobs:
 
       - name: Checkout submodules with --jobs
         run: |
-          git submodule update --init --depth 1 --jobs ${{ steps.cpu-count.outputs.count }}
+          git submodule update --init --depth 1 --single-branch --jobs ${{ steps.cpu-count.outputs.count }}
 
       - name: Update cpp submodules recursively with --jobs
         run: |
           git submodule update --init --recursive \
-            --depth 1 \
-            --filter=blob:none \
+            --depth 1 --single-branch \
             --jobs ${{ steps.cpu-count.outputs.count }} \
             --force \
             test-server/cpp-v2-transition-server/aws-sdk-cpp \
@@ -171,9 +160,7 @@ jobs:
       - name: Wait for servers to start
         run: cd test-server && make wait-all-servers
         env:
-          AWS_REGION: us-west-2
-          TEST_SERVER_S3_BUCKET: ${{ vars.TEST_SERVER_S3_BUCKET }}
-          TEST_SERVER_KMS_KEY_ARN: ${{ vars.TEST_SERVER_KMS_KEY_ARN }}
+          MAKEFLAGS: -j${{ steps.cpu-count.outputs.count }}
 
       - name: Run run-tests
         run: cd test-server && make run-tests

test-server/Makefile

@@ -2,9 +2,6 @@
 
 .PHONY: all start-servers run-tests stop-servers clean ci check-env help
 
-# Default target
-all: start-all-servers wait-all-servers run-tests
-
 # CI target for GitHub Actions
 ci:
 	$(MAKE) build-all-servers
@@ -20,13 +17,19 @@ START_SERVER_TARGETS := $(addprefix start-, $(SERVER_DIRS))
 WAIT_SERVER_TARGETS := $(addprefix wait-, $(SERVER_DIRS))
 
 # Build all servers in parallel
-build-all-servers: export MAKEFLAGS=-j$(shell sysctl -n hw.ncpu 2>/dev/null || nproc 2>/dev/null || echo 1)
-build-all-servers: $(BUILD_SERVER_TARGETS)
+build-all-servers:
+	@echo "[`date +%H:%M:%S`] Building all servers..."
+	@$(MAKE) $(BUILD_SERVER_TARGETS)
+	@echo "[`date +%H:%M:%S`] All servers built."
+	@echo "Stopping dotnet servers... this is here to speed up CI because if this target is run with -j it will stay open until it shutdown."
+	@dotnet build-server shutdown
+	@echo "[`date +%H:%M:%S`] Dotnet build servers stopped"
 
 $(BUILD_SERVER_TARGETS): build-%:
 	@if [ -f $*/Makefile ]; then \
-		echo "Building server in $*..."; \
-		$(MAKE) -C $* build-server; \
+		echo "[`date +%H:%M:%S`] Building server in $*..." && \
+		$(MAKE) -C $* build-server && \
+		echo "[`date +%H:%M:%S`] Server $* built successfully"; \
 	else \
 		echo "❌ Error: no Makefile found in $*"; \
 		exit 1; \
@@ -44,18 +47,17 @@ start-servers:
 		$(MAKE) -C $$dir wait-for-server; \
 	done
 
-# Start servers sequentially (no parallel execution)
 start-all-servers:
-	@$(MAKE) MAKEFLAGS= $(START_SERVER_TARGETS)
+	@$(MAKE) $(START_SERVER_TARGETS)
 
 $(START_SERVER_TARGETS): start-%:
 	@if [ -f $*/Makefile ]; then \
-		echo "Starting server in $*..."; \
+		echo "Starting server in $*..." && \
 		$(MAKE) -C $* start-server; \
 	else \
 		echo "❌ Error: no Makefile found in $*"; \
 		exit 1; \
-	fi;
+	fi
 
 wait-all-servers:
 	@echo "Waiting for all servers to be ready..."
@@ -64,12 +66,12 @@ wait-all-servers:
 
 $(WAIT_SERVER_TARGETS): wait-%:
 	@if [ -f $*/Makefile ]; then \
-		echo "Waiting server in $*..."; \
+		echo "Waiting server in $*..." && \
 		$(MAKE) -C $* wait-for-server; \
 	else \
 		echo "❌ Error: no Makefile found in $*"; \
 		exit 1; \
-	fi;
+	fi
 
 
 # Run the Java tests
@@ -82,7 +84,9 @@ run-tests:
 	AWS_SECRET_ACCESS_KEY="$$AWS_SECRET_ACCESS_KEY" \
 	AWS_SESSION_TOKEN="$$AWS_SESSION_TOKEN" \
 	AWS_REGION="us-west-2" \
-	./gradlew --build-cache --info --parallel integ -Dtest.filter.servers="$(FILTER)"
+	./gradlew --build-cache --info --parallel --no-daemon integ \
+	$(if $(TEST),--tests "$(TEST)",) \
+	-Dtest.filter.servers="$(FILTER)"
 	@echo "Tests completed successfully"
 
 # Stop the servers

test-server/cpp-v2-server/Makefile

@@ -11,7 +11,7 @@ build/s3ec-server:
 
 build-server: | build/s3ec-server
 	@echo "Building Cpp V2 server..."
-	cd build && make
+	cd build && $(MAKE)
 
 start-server:
 	@echo "Starting Cpp V2 server..."
@@ -20,7 +20,7 @@ start-server:
 	AWS_SECRET_ACCESS_KEY="$$AWS_SECRET_ACCESS_KEY" \
 	AWS_SESSION_TOKEN="$$AWS_SESSION_TOKEN" \
 	AWS_REGION="us-west-2" \
-	./s3ec-server > server.log 2>&1 & echo $$! > ../$(PID_FILE)
+	./s3ec-server > ../server.log 2>&1 & echo $$! > ../$(PID_FILE)
 	@echo "Cpp V2 server starting..."
 
 stop-server:
@@ -31,7 +31,7 @@ stop-server:
 		kill -9 $$(cat $(PID_FILE)) 2>/dev/null || true; \
 		rm -f $(PID_FILE); \
 	fi
-	@rm -f build/server.log
+	@rm -f server.log
 	@echo "Server stopped"
 
 wait-for-server: