diff --git a/.github/workflows/overcloud-host-image-build.yml b/.github/workflows/overcloud-host-image-build.yml index e51b33f33..b8a1b8402 100644 --- a/.github/workflows/overcloud-host-image-build.yml +++ b/.github/workflows/overcloud-host-image-build.yml @@ -74,7 +74,7 @@ jobs: python3 -m venv kayobe && source kayobe/bin/activate && pip install -U pip && - pip install ../src/kayobe-config/requirements.txt + pip install -r ../src/kayobe-config/requirements.txt - name: Install terraform uses: hashicorp/setup-terraform@v2 diff --git a/.github/workflows/overcloud-host-image-promote.yml b/.github/workflows/overcloud-host-image-promote.yml index a83bc3a3f..06879459f 100644 --- a/.github/workflows/overcloud-host-image-promote.yml +++ b/.github/workflows/overcloud-host-image-promote.yml @@ -56,7 +56,7 @@ jobs: python3 -m venv kayobe && source kayobe/bin/activate && pip install -U pip && - pip install ../src/kayobe-config/requirements.txt + pip install -r ../src/kayobe-config/requirements.txt - name: Bootstrap the control host run: | diff --git a/.github/workflows/overcloud-host-image-upload.yml b/.github/workflows/overcloud-host-image-upload.yml index 055e53c7f..7aceddd16 100644 --- a/.github/workflows/overcloud-host-image-upload.yml +++ b/.github/workflows/overcloud-host-image-upload.yml @@ -56,7 +56,7 @@ jobs: python3 -m venv kayobe && source kayobe/bin/activate && pip install -U pip && - pip install ../src/kayobe-config/requirements.txt + pip install -r ../src/kayobe-config/requirements.txt - name: Bootstrap the control host run: | diff --git a/.github/workflows/stackhpc-container-image-build.yml b/.github/workflows/stackhpc-container-image-build.yml index 7f301962a..e8d83492f 100644 --- a/.github/workflows/stackhpc-container-image-build.yml +++ b/.github/workflows/stackhpc-container-image-build.yml @@ -139,14 +139,14 @@ jobs: python3 -m venv kayobe && source kayobe/bin/activate && pip install -U pip && - pip install ../src/kayobe-config/requirements.txt + pip install -r ../src/kayobe-config/requirements.txt # Required for Pulp auth proxy deployment and Docker registry login. # Normally installed during host configure. - name: Install Docker Python SDK run: | sudo pip install docker 'requests<2.32.0' - + - name: Get Kolla tag id: write-kolla-tag run: echo "kolla-tag=${{ needs.generate-tag.outputs.openstack_release }}-${{ matrix.distro }}-${{ matrix.distro == 'rocky' && '9' || 'jammy' }}-${{ needs.generate-tag.outputs.datetime_tag }}" >> $GITHUB_OUTPUT diff --git a/doc/source/contributor/environments/ci-aio.rst b/doc/source/contributor/environments/ci-aio.rst index 8dc7d3201..542f53ec1 100644 --- a/doc/source/contributor/environments/ci-aio.rst +++ b/doc/source/contributor/environments/ci-aio.rst @@ -115,7 +115,7 @@ Create a virtual environment and install Kayobe: python3 -m venv kayobe source kayobe/bin/activate pip install -U pip - pip install ../src/kayobe-config/requirements.txt + pip install -r ../src/kayobe-config/requirements.txt popd Add initial network configuration: diff --git a/doc/source/contributor/environments/ci-builder.rst b/doc/source/contributor/environments/ci-builder.rst index 6bf86ae07..a0b898ccd 100644 --- a/doc/source/contributor/environments/ci-builder.rst +++ b/doc/source/contributor/environments/ci-builder.rst @@ -70,7 +70,7 @@ Create a virtual environment and install Kayobe: python3 -m venv kayobe source kayobe/bin/activate pip install -U pip - pip install ../src/kayobe-config/requirements.txt + pip install -r ../src/kayobe-config/requirements.txt popd Add initial network configuration: diff --git a/etc/kayobe/environments/ci-aio/automated-setup.sh b/etc/kayobe/environments/ci-aio/automated-setup.sh index 93a310ed2..84e738247 100644 --- a/etc/kayobe/environments/ci-aio/automated-setup.sh +++ b/etc/kayobe/environments/ci-aio/automated-setup.sh @@ -60,7 +60,7 @@ set +u source kayobe/bin/activate set -u pip install -U pip -pip install ../src/kayobe-config/requirements.txt +pip install -r ../src/kayobe-config/requirements.txt popd if ! ip l show breth1 >/dev/null 2>&1; then