@@ -25,7 +25,7 @@ elif $KAYOBE_AIO_LVM; then
2525fi
2626
2727if type dnf; then
28- sudo dnf -y install git
28+ sudo dnf -y install git python3.12
2929else
3030 sudo apt update
3131 sudo apt -y install gcc git libffi-dev python3-dev python-is-python3 python3-venv
5252mkdir -p venvs
5353pushd venvs
5454if [[ ! -d kayobe ]]; then
55- python3 -m venv kayobe
55+ python3.12 -m venv kayobe
5656fi
5757# NOTE: Virtualenv's activate and deactivate scripts reference an
5858# unbound variable.
@@ -88,22 +88,43 @@ kayobe overcloud host configure
8888
8989kayobe overcloud service deploy
9090
91+ export KAYOBE_CONFIG_SOURCE_PATH=$BASE_PATH /src/kayobe-config
92+ export KAYOBE_VENV_PATH=$BASE_PATH /venvs/kayobe
93+ pushd $BASE_PATH /src/kayobe
94+ ./dev/overcloud-test-vm.sh
95+
9196if $AIO_RUN_TEMPEST ; then
97+ if type apt; then
98+ sudo apt install docker-buildx-plugin
99+ fi
100+
92101 pushd $BASE_PATH /src/kayobe-config
93102 git submodule init
94103 git submodule update
95- sudo DOCKER_BUILDKIT=1 docker build --build-arg BASE_IMAGE=rockylinux:9 --file .automation/docker/kayobe/Dockerfile --tag kayobe:latest --network host .
104+
105+ sudo DOCKER_BUILDKIT=1 docker build \
106+ --build-arg BASE_IMAGE=rockylinux:9 \
107+ --build-arg USE_PYTHON_312=true \
108+ --file .automation/docker/kayobe/Dockerfile \
109+ --tag kayobe:latest \
110+ --network host .
111+
96112 export KAYOBE_AUTOMATION_SSH_PRIVATE_KEY=$( cat ~ /.ssh/id_rsa)
97113 mkdir -p tempest-artifacts
98- sudo -E docker run --name kayobe-automation --detach -it --rm --network host \
99- -v $( pwd) :/stack/kayobe-automation-env/src/kayobe-config -v $( pwd) /tempest-artifacts:/stack/tempest-artifacts \
100- -e KAYOBE_ENVIRONMENT -e KAYOBE_VAULT_PASSWORD -e KAYOBE_AUTOMATION_SSH_PRIVATE_KEY kayobe:latest \
101- /stack/kayobe-automation-env/src/kayobe-config/.automation/pipeline/tempest.sh -e ansible_user=stack
114+
115+ sudo -E docker run \
116+ --name kayobe-automation \
117+ --detach -it --rm \
118+ --network host \
119+ -v $( pwd) :/stack/kayobe-automation-env/src/kayobe-config \
120+ -v $( pwd) /tempest-artifacts:/stack/tempest-artifacts \
121+ -e KAYOBE_ENVIRONMENT \
122+ -e KAYOBE_VAULT_PASSWORD \
123+ -e KAYOBE_AUTOMATION_SSH_PRIVATE_KEY \
124+ kayobe:latest \
125+ /stack/kayobe-automation-env/src/kayobe-config/.automation/pipeline/tempest.sh \
126+ -e ansible_user=stack
127+
102128 sleep 300
103129 sudo docker logs -f tempest
104- else
105- export KAYOBE_CONFIG_SOURCE_PATH=$BASE_PATH /src/kayobe-config
106- export KAYOBE_VENV_PATH=$BASE_PATH /venvs/kayobe
107- pushd $BASE_PATH /src/kayobe
108- ./dev/overcloud-test-vm.sh
109130fi
0 commit comments