diff --git a/.github/workflows/pulp_images.yml b/.github/workflows/pulp_images.yml index b5b028f2..aaa9ff38 100644 --- a/.github/workflows/pulp_images.yml +++ b/.github/workflows/pulp_images.yml @@ -12,6 +12,7 @@ env: COLORTERM: 'yes' TERM: 'xterm-256color' PYTEST_ADDOPTS: '--color=yes' + PULP_FILE_VERSION: '1.12' # Forces to use the latest compatible version with pulpcore 3.22 jobs: lint: @@ -90,7 +91,7 @@ jobs: podman version buildah version podman build --format docker --file images/Containerfile.core.base --tag pulp/base:${TEMP_BASE_TAG} . - podman build --format docker --file images/pulp_ci_centos/Containerfile --tag pulp/pulp-ci-centos:${TEMP_BASE_TAG} --build-arg FROM_TAG=${TEMP_BASE_TAG} . + podman build --format docker --file images/pulp_ci_centos/Containerfile --tag pulp/pulp-ci-centos:${TEMP_BASE_TAG} --build-arg FROM_TAG=${TEMP_BASE_TAG} --build-arg PULP_FILE_VERSION=${PULP_FILE_VERSION} . # we use the docker format (default), even though it may not be the fastest, # because it supports saving both images at once. # However, it seems to export the common layers twice. @@ -186,6 +187,12 @@ jobs: echo ::endgroup:: echo "HTTPIE_CONFIG_DIR=$GITHUB_WORKSPACE/.ci/assets/httpie/" >> $GITHUB_ENV pip install podman-compose + if [[ $(dpkg-query --showformat='${Version}' --show podman) == "3.4.4+ds1-1ubuntu1.22.04.1" && $(dpkg-query --showformat='${Version}' --show containernetworking-plugins) == "0.9.1+ds1-1" ]] + then + echo "Working around https://bugs.launchpad.net/ubuntu/+source/libpod/+bug/2024394" + curl -O http://archive.ubuntu.com/ubuntu/pool/universe/g/golang-github-containernetworking-plugins/containernetworking-plugins_1.1.1+ds1-1_amd64.deb + sudo dpkg -i containernetworking-plugins_1.1.1+ds1-1_amd64.deb + fi shell: bash - name: Build images run: | @@ -242,7 +249,11 @@ jobs: # Reuse the folders from the s6 mode tests FILE="docker-compose.folders.yml" # We'll pull the web image from a registry since we didn't build it. - WEB_TAG="${APP_BRANCH}" + if [ "${{ matrix.image_variant }}" == "nightly" ]; then + WEB_TAG="nightly" + else + WEB_TAG="${APP_BRANCH}" + fi else FILE="docker-compose.yml" WEB_TAG="${TEMP_APP_TAG}"