1

Author: dkropachev

.github/workflows/build-cpack-packages.yml

@@ -48,60 +48,20 @@ jobs:
         run: make build-package
 
       - name: Install driver packages (DEB)
-        run: |
-          set -euo pipefail
-          shopt -s nullglob
-          DRIVER_PACKAGES=(build/*.deb)
-          if [ "${#DRIVER_PACKAGES[@]}" -eq 0 ]; then
-            echo "No driver DEB packages produced"
-            exit 1
-          fi
-          echo "Installing ${#DRIVER_PACKAGES[@]} DEB package(s):"
-          for pkg in "${DRIVER_PACKAGES[@]}"; do
-            echo "  - $(basename "$pkg")"
-          done
-          # Install both runtime and dev packages
-          sudo dpkg -i "${DRIVER_PACKAGES[@]}"
-          sudo apt-get install -f -y
-
-      - name: Verify dev package installation
-        run: |
-          set -euo pipefail
-          # Verify headers are installed
-          if [ ! -f /usr/include/cassandra.h ]; then
-            echo "ERROR: cassandra.h header not found - dev package may not be installed"
-            exit 1
-          fi
-          # Verify pkg-config file is installed
-          if ! pkg-config --exists scylla-cpp-driver; then
-            echo "ERROR: scylla-cpp-driver.pc not found - dev package may not be installed"
-            exit 1
-          fi
-          echo "Dev package verification successful"
+        run: make -C packaging/smoke-test-app package
 
       - name: Build smoke-test application package
-        run: |
-          set -euo pipefail
-          make -C packaging/smoke-test-app package \
+        run: make -C packaging/smoke-test-app package \
             BUILD_TYPE=${{ inputs.build-type }} \
             CMAKE_GENERATOR=Ninja \
             INSTALL_PREFIX=/usr \
             CPACK_GENERATORS="DEB RPM"
 
       - name: Install smoke-test application package (DEB)
-        run: |
-          set -euo pipefail
-          make -C packaging/smoke-test-app install-deb
+        run: make -C packaging/smoke-test-app install-deb
 
       - name: Run smoke-test application against local Scylla
-        run: |
-          set -euo pipefail
-          cleanup() {
-            sudo docker compose -f tests/examples_cluster/docker-compose.yml down --remove-orphans
-          }
-          trap cleanup EXIT
-          sudo docker compose -f tests/examples_cluster/docker-compose.yml up -d --wait
-          /usr/bin/scylla-cpp-driver-smoke-test 172.43.0.2
+        run: make -C packaging/smoke-test-app test-package
 
       - name: Collect artifacts
         run: |

packaging/smoke-test-app/Makefile

@@ -6,6 +6,7 @@ CMAKE_GENERATOR ?=
 INSTALL_PREFIX ?=
 CPACK_GENERATORS ?= productbuild DragNDrop
 INSTALL_TARGET ?= /
+MAKEFILE_PATH := $(abspath $(dir $(abspath $(lastword $(MAKEFILE_LIST)))))
 
 CMAKE_GENERATOR_FLAG :=
 ifneq ($(strip $(CMAKE_GENERATOR)),)
@@ -53,7 +54,7 @@ package:
 install-pkg:
 	set -euo pipefail; \
 	shopt -s nullglob; \
-	packages=($(BUILD_DIR)/scylla-cpp-driver-smoke-app-*-macos*.pkg); \
+	packages=($(BUILD_DIR)/scylla-cpp-driver-smoke-app-*-macos*.pkg);\
 	if [ "$${#packages[@]}" -eq 0 ]; then \
 		echo "No smoke-test productbuild packages produced"; \
 		exit 1; \
@@ -62,6 +63,32 @@ install-pkg:
 		sudo installer -pkg "$$pkg" -target $(INSTALL_TARGET); \
 	done
 
+install-driver-dev-deb:
+	@shopt -s nullglob;\
+	DRIVER_PACKAGES=(${MAKEFILE_PATH}/../../build/*-dev*.deb);\
+	if [ "$${#DRIVER_PACKAGES[@]}" -eq 0 ]; then \
+		echo "No driver dev DEB packages found";\
+		exit 1;\
+	elif [ "$${#DRIVER_PACKAGES[@]}" -ne 1 ]; then \
+		echo "Move than one dev DEB packages were found: ${DRIVER_PACKAGES[@]}";\
+		exit 1;\
+	fi;\
+	echo "Installing DEB package $${DRIVER_PACKAGES[0]}";\
+	sudo dpkg -i "$${DRIVER_PACKAGES[0]}"
+
+install-driver-deb:
+	@shopt -s extglob;\
+	@DRIVER_PACKAGES=!(${MAKEFILE_PATH}/../../build/*-dev*.deb);\
+	if [ "$${#DRIVER_PACKAGES[@]}" -eq 0 ]; then \
+		echo "No driver dev DEB packages found";\
+		exit 1;\
+	elif [ "$${#DRIVER_PACKAGES[@]}" -ne 1 ]; then \
+		echo "Move than one dev DEB packages were found: ${DRIVER_PACKAGES[@]}";\
+		exit 1;\
+	fi;\
+	echo "Installing DEB package $${DRIVER_PACKAGES[0]}";\
+	sudo dpkg -i "$${DRIVER_PACKAGES[0]}"
+
 .PHONY: install-deb
 install-deb:
 	set -euo pipefail; \