@@ -19,7 +19,7 @@ if [ -z "${METAL3_DEV_ENV}" ]; then
1919 # TODO -- come up with a plan for continuously updating this
2020 # Note we only do this in the case where METAL3_DEV_ENV is
2121 # unset, to enable developer testing of local checkouts
22- git reset a994b1447f89e20ec9cc161700a9e829fd5d4b89 --hard
22+ git reset d9fc324e8a37935b6c1b4555b5a8724b29626259 --hard
2323 popd
2424fi
2525
@@ -113,16 +113,15 @@ elif [[ $GOARCH == "x86_64" ]]; then
113113 GOARCH=" amd64"
114114fi
115115
116- # Also need the 3.9 version of netaddr for ansible.netcommon
117- # and lxml for the pyxpath script
118- sudo python -m pip install netaddr lxml
116+ sudo python -m venv --system-site-packages " ${ANSIBLE_VENV} "
119117
120- sudo python -m pip install ansible==" ${ANSIBLE_VERSION} "
118+ # Also need the 3.9 version of netaddr for ansible.netcommon
119+ " ${ANSIBLE_VENV} /bin/pip" install netaddr ansible==" ${ANSIBLE_VERSION} "
121120
122121pushd ${METAL3_DEV_ENV_PATH}
123- ansible -galaxy install -r vm-setup/requirements.yml
124- ansible -galaxy collection install --upgrade ansible.netcommon ansible.posix ansible.utils community.general
125- ANSIBLE_FORCE_COLOR=true ansible -playbook \
122+ " ${ANSIBLE} -galaxy" install -r vm-setup/requirements.yml
123+ " ${ANSIBLE} -galaxy" collection install --upgrade ansible.netcommon ansible.posix ansible.utils community.general
124+ ANSIBLE_FORCE_COLOR=true " ${ANSIBLE} -playbook" \
126125 -e " working_dir=$WORKING_DIR " \
127126 -e " virthost=$HOSTNAME " \
128127 -e " go_version=$GO_VERSION " \
@@ -146,6 +145,9 @@ if [[ "${NODES_PLATFORM}" == "baremetal" ]] ; then
146145 sudo dnf -y install ipmitool
147146fi
148147
148+ # lxml is needed for our pyxpath tool
149+ sudo dnf -y install python3-lxml
150+
149151# We use yq in a few places for processing YAML but it isn't packaged
150152# for CentOS/RHEL so we have to install from pip. We do not want to
151153# overwrite an existing installation of the golang version, though,
0 commit comments