- Tuning build automation.

Author: general-kroll-4-life

.github/workflows/build.yml

@@ -1017,8 +1017,8 @@ jobs:
 
     - shell: wsl-bash {0}
       name: Run robot mocked functional tests
-      env:
-        PYTHONPATH: '${{ env.PYTHONPATH }}:${{ github.workspace }}/test/python'
+      # env:
+      #   PYTHONPATH: '${{ env.PYTHONPATH }}:${{ github.workspace }}/test/python'
       run: |
           . cicd/version.txt
           export BUILDBRANCH="${{github.ref}}"
@@ -1033,6 +1033,7 @@ jobs:
             then
             export BUILDPATCHVERSION="${BUILDPATCHVERSION}"
           fi
+          export PYTHONPATH="$PYTHONPATH:$(pwd)/test/python"
           python3 cicd/python/build.py --robot-test --config='{ "variables":  { "IS_WSL": true } }'
 
     - shell: wsl-bash {0}
@@ -1047,7 +1048,7 @@ jobs:
       if: env.AZURE_CLIENT_SECRET != ''
       env:
         AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }} 
-        PYTHONPATH: '${{ env.PYTHONPATH }}:${{ github.workspace }}/test/python'
+        # PYTHONPATH: '${{ env.PYTHONPATH }}:${{ github.workspace }}/test/python'
       run: |
           . cicd/version.txt
           export AZURE_CLIENT_ID='${{ secrets.AZURE_CLIENT_ID }}'
@@ -1069,6 +1070,7 @@ jobs:
           echo "## Stray flask apps to be killed before robot tests ##"
           pgrep -f flask | xargs kill -9 || true
           echo "## End ##"
+          export PYTHONPATH="$PYTHONPATH:$(pwd)/test/python"
           python3 cicd/python/build.py --robot-test-integration --config='{ "variables":  { "IS_WSL": true } }'
 
   macosbuild:

cicd/util/01-build-robot-lib.sh

@@ -19,23 +19,26 @@ PACKAGE_ROOT="${REPOSITORY_ROOT}/test"
 
 venv_path="${REPOSITORY_ROOT}/.venv"
 
-expectedRobotLibArtifact="$(realpath ${PACKAGE_ROOT}/dist/stackql_test_tooling-0.1.0-py3-none-any.whl)"
 
-rm -f "${expectedRobotLibArtifact}" || true
+rm -f ${PACKAGE_ROOT}/dist/*.whl || true
 
 cd "${PACKAGE_ROOT}"
 
 poetry install
 
 poetry build
 
-if [ ! -f "${expectedRobotLibArtifact}" ]; then
-    >&2 echo "Expected artifact not found: ${expectedRobotLibArtifact}"
+filez="$(ls ${PACKAGE_ROOT}/dist/*.whl)" || true
+
+if [ "${filez}" = "" ]; then
+    >&2 echo "No wheel files found in ${PACKAGE_ROOT}/dist. Please check the build process."
     exit 1
+else
+    echo "Wheel files found in ${PACKAGE_ROOT}/dist: ${filez}"
 fi
 
 
->&2 echo "Artifact built successfully: ${expectedRobotLibArtifact}"
+# >&2 echo "Artifact built successfully: ${expectedRobotLibArtifact}"
 
 
 

cicd/util/02-install-robot-lib.sh

@@ -14,7 +14,7 @@ REPOSITORY_ROOT="$(realpath ${CURDIR}/../..)"
 
 venv_path="${REPOSITORY_ROOT}/.venv"
 
-expectedRobotLibArtifact="$(realpath ${PACKAGE_ROOT}/dist/stackql_test_tooling-0.1.0-py3-none-any.whl)"
+# expectedRobotLibArtifact="$(realpath ${PACKAGE_ROOT}/dist/stackql_test_tooling-0.1.0-py3-none-any.whl)"
 
 if [ ! -d "${venv_path}" ]; then
     echo "Creating virtual environment at ${venv_path}"
@@ -23,16 +23,23 @@ else
     echo "Virtual environment already exists at ${venv_path}"
 fi
 
-if [ ! -f "${expectedRobotLibArtifact}" ]; then
-    >&2 echo "Expected lib artifact not found: ${expectedRobotLibArtifact}"
+filez="$(ls ${PACKAGE_ROOT}/dist/*.whl)" || true
+
+if [ "${filez}" = "" ]; then
+    >&2 echo "No wheel files found in ${PACKAGE_ROOT}/dist. Please check the build process."
     exit 1
+else
+    echo "Wheel files found in ${PACKAGE_ROOT}/dist: ${filez}"
 fi
 
 source ${REPOSITORY_ROOT}/.venv/bin/activate
 
 pip install -r ${REPOSITORY_ROOT}/cicd/requirements.txt
 
-pip install "${expectedRobotLibArtifact}" --force-reinstall
+for file in ${PACKAGE_ROOT}/dist/*.whl; do
+    pip3 install "$file" --force-reinstall
+done
+