Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove a CI workaround fix that is no longer needed #699

Merged
merged 2 commits into from
Dec 10, 2024
Merged

Remove a CI workaround fix that is no longer needed #699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c282ec
Remove a CI workaround fix that is no longer needed
gerrod3 Dec 9, 2024
5ca588e
Run the compose test only on the minimal images
gerrod3 Dec 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions .github/actions/build_image/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,18 +59,6 @@ runs:
podman load -i base-images.tar
shell: bash

- name: Install httpie and podman-compose
run: |
echo "HTTPIE_CONFIG_DIR=$GITHUB_WORKSPACE/.ci/assets/httpie/" >> $GITHUB_ENV
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-3_amd64.deb
sudo dpkg -i containernetworking-plugins_1.1.1+ds1-3_amd64.deb
# Ubuntu 22.04 has old podman 3.4.4, we need podman-compose==1.0.3 to avoid an
# error with dependency contianers not being detected as running.
# "error generating dependency graph for container"
pip install httpie podman-compose==1.0.3
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need httpie anyway?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

probably not.

shell: bash

- name: Build images
run: |
podman version
Expand Down
21 changes: 8 additions & 13 deletions .github/actions/test_image/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@ inputs:
runs:
using: "composite"
steps:
- name: Install httpie and podman-compose
run: |
echo "HTTPIE_CONFIG_DIR=$GITHUB_WORKSPACE/.ci/assets/httpie/" >> $GITHUB_ENV
pip install httpie podman-compose
shell: bash

- name: Test image with upgrade in s6 mode (pulp)
if: inputs.image_name == 'pulp'
run: |
Expand All @@ -37,19 +43,8 @@ runs:
shell: bash

- name: Test Compose up
if: inputs.image_name == 'pulp-minimal' || inputs.image_name == 'galaxy-minimal'
run: |
if [[ "${{ inputs.image_name }}" == "pulp" || "${{ inputs.image_name }}" == "galaxy" ]]; then
FILE="compose.folders.yml"
# We'll pull the web image from a registry since we didn't build it.
if [ "${{ inputs.image_variant }}" == "nightly" ]; then
WEB_TAG="nightly"
else
WEB_TAG="${{ inputs.app_branch }}"
fi
else
FILE="compose.yml"
WEB_TAG="${{ inputs.app_arch_tag }}"
fi
base_image=$(echo ${{ inputs.image_name }} | cut -d '-' -f1)
images/compose/test.sh "${{ inputs.image_name }}:${{ inputs.app_arch_tag }}" "${base_image}-web:${WEB_TAG}" $FILE
images/compose/test.sh "${{ inputs.image_name }}:${{ inputs.app_arch_tag }}" "${base_image}-web:${{ inputs.app_arch_tag }}" "compose.yml"
shell: bash
Loading