Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/pip/dot-config/dependencies-9513f…
Browse files Browse the repository at this point in the history
…e7742
  • Loading branch information
ssbarnea authored Oct 11, 2024
2 parents cfa9fc9 + 5f912a6 commit d0eb96e
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 3 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -180,3 +180,4 @@ _readthedocs
out
docs/examples/context/_build
docs/examples/context
devspaces/context/*.whl
1 change: 0 additions & 1 deletion devspaces/context/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
ansible-dev-tools
kubernetes==29.0.0
molecule-plugins[podman]==23.5.3
2 changes: 1 addition & 1 deletion devspaces/context/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ dnf install -y -q \
# python${PYV}-ruamel-yaml \
dnf -y -q clean all

"/usr/bin/python${PYV}" -m pip install --root-user-action=ignore -r requirements.txt
"/usr/bin/python${PYV}" -m pip install --root-user-action=ignore "$(ls -1 ./*.whl)[server,lock]" -r requirements.txt

ansible-galaxy collection install -r requirements.yml

Expand Down
15 changes: 14 additions & 1 deletion tools/devspaces.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,22 @@
set -euxo pipefail
ADT_CONTAINER_ENGINE=${ADT_CONTAINER_ENGINE:-docker}
CONTAINER_NAME=ansible/ansible-workspace-env-reference:test
env

mkdir -p out
# Ensure that we packaged the code first
WHEELS=(dist/*.whl)
if [ ${#WHEELS[@]} -ne 1 ]; then
tox -e pkg
WHEELS=(dist/*.whl)
if [ ${#WHEELS[@]} -ne 1 ]; then
echo "Unable to find a single wheel file in dist/ directory."
exit 2
fi
fi
tox -e pkg
rm -f devspaces/context/*.whl
cp dist/*.whl devspaces/context

# we force use of linux/amd64 platform because source image supports only this
# platform and without it, it will fail to cross-build when task runs on arm64.
# --metadata-file=out/devspaces.meta --no-cache
Expand Down

0 comments on commit d0eb96e

Please sign in to comment.