Skip to content

Commit 07c549d

Browse files
authored
fix: remove source dir mounts from integration tests (#864)
Container images are now built from source via pixi (since #810), so editable pip installs of mounted source dirs are redundant. Removing them fixes the gubbins init-cs failure caused by git "dubious ownership" errors when the container UID differs from the mounted source owner.
1 parent 094a3d6 commit 07c549d

1 file changed

Lines changed: 1 addition & 13 deletions

File tree

.github/workflows/main.yml

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -159,23 +159,12 @@ jobs:
159159
demo_args+=("--exit-when-done")
160160
demo_args+=("--ci-values" "../diracx-charts/demo/ci_values.yaml")
161161
162-
declare -a demo_source_dirs=("$PWD")
163-
164162
# Download helm/kubectl/kind first
165163
../diracx-charts/run_demo.sh --only-download-deps
166164
167165
if [ ${{ matrix.extension }} == 'gubbins' ]; then
168166
demo_args+=("--set-value" "diracx.developer.autoReload=false")
169167
170-
# We have to copy the code to another directory
171-
# and make it a git repository by itself because otherwise the
172-
# root in the pyproject do not make sense once mounted
173-
# in the containers.
174-
cp -r ./extensions/gubbins /tmp/
175-
sed -i 's@../..@.@g' /tmp/gubbins/pyproject.toml
176-
sed -i 's@../../@@g' /tmp/gubbins/gubbins-*/pyproject.toml
177-
git init /tmp/gubbins/
178-
179168
# Copy gubbins-charts to a temporary location and build dependencies
180169
cp -r ./extensions/gubbins-charts /tmp/
181170
../diracx-charts/.demo/helm dependency build /tmp/gubbins-charts
@@ -189,7 +178,6 @@ jobs:
189178
demo_args+=("--load-docker-image" "ghcr.io/gubbins/services:dev")
190179
demo_args+=("--load-docker-image" "ghcr.io/gubbins/client:dev")
191180
demo_args+=("--prune-loaded-images")
192-
demo_source_dirs+=("/tmp/gubbins/")
193181
elif [ ${{ matrix.extension }} != 'diracx' ]; then
194182
echo "Unknown extension: ${{ matrix.extension }}"
195183
exit 1
@@ -203,7 +191,7 @@ jobs:
203191
204192
# Run the demo with the provided arguments
205193
set -x
206-
../diracx-charts/run_demo.sh "${demo_args[@]}" "${demo_source_dirs[@]}"
194+
../diracx-charts/run_demo.sh "${demo_args[@]}"
207195
- name: Debugging information
208196
if: always()
209197
run: .github/scripts/collect-k8s-debug-info.sh "$PWD/../diracx-charts/.demo" "${{ matrix.extension == 'gubbins' && 'gubbins' || 'diracx' }}"

0 commit comments

Comments
 (0)