@@ -19,7 +19,7 @@ if [ -z "${METAL3_DEV_ENV}" ]; then
19
19
# TODO -- come up with a plan for continuously updating this
20
20
# Note we only do this in the case where METAL3_DEV_ENV is
21
21
# unset, to enable developer testing of local checkouts
22
- git reset a994b1447f89e20ec9cc161700a9e829fd5d4b89 --hard
22
+ git reset d9fc324e8a37935b6c1b4555b5a8724b29626259 --hard
23
23
popd
24
24
fi
25
25
@@ -113,16 +113,15 @@ elif [[ $GOARCH == "x86_64" ]]; then
113
113
GOARCH=" amd64"
114
114
fi
115
115
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} "
119
117
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} "
121
120
122
121
pushd ${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" \
126
125
-e " working_dir=$WORKING_DIR " \
127
126
-e " virthost=$HOSTNAME " \
128
127
-e " go_version=$GO_VERSION " \
@@ -146,6 +145,9 @@ if [[ "${NODES_PLATFORM}" == "baremetal" ]] ; then
146
145
sudo dnf -y install ipmitool
147
146
fi
148
147
148
+ # lxml is needed for our pyxpath tool
149
+ sudo dnf -y install python3-lxml
150
+
149
151
# We use yq in a few places for processing YAML but it isn't packaged
150
152
# for CentOS/RHEL so we have to install from pip. We do not want to
151
153
# overwrite an existing installation of the golang version, though,
0 commit comments