From e1302220558f7eef05ce45388f5e5ec761b318a8 Mon Sep 17 00:00:00 2001
From: Andrea Sorbini <asorbini@rti.com>
Date: Mon, 15 Apr 2024 23:55:46 -0700
Subject: [PATCH] Debugging

---
 .github/workflows/_deb_build.yml |  6 +++---
 .github/workflows/ci.yml         |  4 ----
 Makefile                         | 18 +++++++++---------
 scripts/cleanup_workflows.sh     |  2 +-
 4 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/_deb_build.yml b/.github/workflows/_deb_build.yml
index 4e8649e..8b41413 100644
--- a/.github/workflows/_deb_build.yml
+++ b/.github/workflows/_deb_build.yml
@@ -72,9 +72,9 @@ jobs:
           image_version="$(echo ${image_version} | tr / -)"
           deb_builder_tag=$(echo ${{inputs.base-tag}} | tr : - | tr / -)
           test_date=$(date +%Y%m%d-%H%M%S)
-          test_id=deb-${builder_tag}-${{ inputs.platform }}__${image_version}
+          test_id=deb-${deb_builder_tag}-${{ inputs.platform }}__${image_version}
           test_artifact=uno-test-${test_id}__${test_date}
-          test_runner_artifact=uno-runner-${builder_tag}-${{ inputs.platform }}__${image_version}__${test_date}
+          test_runner_artifact=uno-runner-${deb_builder_tag}-${{ inputs.platform }}__${image_version}__${test_date}
           deb_artifact=uno-deb-${builder_tag}-${{ inputs.platform }}__${image_version}__${test_date}
           (
             echo RUNNER=${runner}
@@ -121,7 +121,7 @@ jobs:
       uses: actions/upload-artifact@v4
       with:
         name: ${{ needs.config.outputs.TEST_RUNNER_ARTIFACT }}
-        path: src/uno/dist/bundle/runner
+        path: src/uno/dist/bundle/default/runner
 
     - name: Fix permissions
       run: |
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e5f4776..320c687 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -171,10 +171,6 @@ jobs:
         if: ${{ inputs.run-integration }}
         run: |
           make -C src/uno extract-license
-          docker run --rm \
-            -v $(pwd):/workspace \
-            ${{ needs.config.outputs.TEST_IMAGE }} \
-            cp /rti_license.dat /workspace/rti_license.dat
 
       - name: Run unit tests
         if: inputs.run-unit
diff --git a/Makefile b/Makefile
index 9737d3d..53c528e 100644
--- a/Makefile
+++ b/Makefile
@@ -184,12 +184,16 @@ deb:
 test: test-unit test-integration ;
 
 
-# Call pytest directly from venv, since it's mounted on containers too
-PYTEST ?= .venv/bin/pytest
+# Call pytest directly from venv on host, but unqualified in container
+ifneq ($(IN_DOCKER),)
+PYTEST_UNIT ?= .venv/bin/pytest
+else # ifneq ($(IN_DOCKER),)
+PYTEST_UNIT ?= pytest
+endif # ifneq ($(IN_DOCKER),)
 
 # Run unit tests
 BASE_UNIT_TEST_COMMAND := \
-  $(PYTEST) -s -v \
+  $(PYTEST_UNIT) -s -v \
     --junit-xml=$(TEST_RESULTS_DIR)/$(TEST_JUNIT_REPORT)__unit.xml \
     test/unit
 # When run by a CI test, the test image is expected to contain an
@@ -217,11 +221,7 @@ test-unit: .venv
 test-integration: .venv
 	@$(CHECK_RTI_LICENSE_FILE)
 	mkdir -p $(TEST_RESULTS_DIR)
-	set -ex; \
-	# For releases, we shouldn't mount the local module, but rather
-	# test the one included in the docker image
-	[ -z "${TEST_RELEASE}" ] || export DEV=y; \
-	$(PYTEST) -s -v \
+	$</bin/pytest -s -v \
 		--junit-xml=$(TEST_RESULTS_DIR)/$(TEST_JUNIT_REPORT)__integration.xml \
 		test/integration \
 		$(INTEGRATION_TEST_ARGS)
@@ -285,7 +285,7 @@ else # ifneq ($(USE_POETRY),)
        $(wildcard plugins/*/pyproject.toml)
 	rm -rf $@
 	python3 -m venv $@
-	$@/bin/pip install -U pip setuptools ruff pre-commit pytest
+	$@/bin/pip install -U pip setuptools ruff pre-commit
 	$@/bin/pip install -e .
 	[ -z "$(UNO_MIDDLEWARE)" ] || $@/bin/pip install -e plugins/$(UNO_MIDDLEWARE)
 	[ -n "$(UNO_MIDDLEWARE)" ] || $@/bin/pip install rti.connext
diff --git a/scripts/cleanup_workflows.sh b/scripts/cleanup_workflows.sh
index 2e350e0..7c319ec 100755
--- a/scripts/cleanup_workflows.sh
+++ b/scripts/cleanup_workflows.sh
@@ -66,7 +66,7 @@ deleterun() {
   run="${1}"
   id="$(cut -f 3 <<< "$run")"
   if [ -z "${NOOP}" ]; then
-    gh api -X DELETE "/repos/$repo/actions/runs/$id"
+    gh api -X DELETE "/repos/${REPO}/actions/runs/$id"
     [[ $? = 0 ]] && result="OK!" || result="BAD"
     printf "%s\t%s\n" "$result" "$run"
   else