Merge pull request #679 from gerrod3/night-begone

Remove nightly scenario and galaxy images

.github/actions/build_image/action.yml

@@ -1,6 +1,6 @@
 ---
 name: Build App Images
-description: Build one of the App images (pulp, pulp-minimal, galaxy, galaxy-minimal)
+description: Build one of the App images (pulp, pulp-minimal)
 inputs:
   image_variant:
     description: 'Whether the image is a stable or nightly build'
@@ -48,7 +48,7 @@ runs:
         sudo podman run --rm --privileged multiarch/qemu-user-static --reset -p yes
         for ARCH in arm64 amd64
         do
-          if [[ "${{ inputs.image_name }}" == "pulp-minimal" || "${{ inputs.image_name }}" == "galaxy-minimal" ]]; then
+          if [[ "${{ inputs.image_name }}" == "pulp-minimal" ]]; then
             base_image=$(echo ${{ inputs.image_name }} | cut -d '-' -f1)
             podman build --platform linux/${ARCH} --format docker --pull=false --file images/${{ inputs.image_name }}/${{ inputs.image_variant }}/Containerfile.core --tag pulp/${{ inputs.image_name }}:ci-${ARCH} --build-arg FROM_TAG=ci-${ARCH} .
             podman build --platform linux/${ARCH} --format docker --pull=false --file images/${{ inputs.image_name }}/${{ inputs.image_variant }}/Containerfile.webserver --tag pulp/${base_image}-web:ci-${ARCH} --build-arg FROM_TAG=ci-${ARCH} .
@@ -63,12 +63,7 @@ runs:
       id: image_version_branch
       run: |
         base_image=$(echo ${{ inputs.image_name }} | cut -d '-' -f1)
-        if [[ "${base_image}" == "pulp" ]]; then
-          pip_name="pulpcore"
-        else
-          pip_name="galaxy-ng"
-        fi
-        app_version=$(podman run --pull=never pulp/${{ inputs.image_name }}:ci-amd64 bash -c "pip3 show ${pip_name} | sed -n -e 's/Version: //p'")
+        app_version=$(podman run --pull=never pulp/${{ inputs.image_name }}:ci-amd64 bash -c "pip3 show pulpcore | sed -n -e 's/Version: //p'")
         app_branch=$(echo ${app_version} | grep -oP '\d+\.\d+')
 
         echo "APP_VERSION: ${app_version}"

.github/actions/test_image/action.yml

@@ -5,10 +5,6 @@ inputs:
   image_name:
     description: 'Name of the image to be tested'
     required: true
-  image_variant:
-    description: 'Stable or nightly build'
-    required: true
-    default: 'stable'
   app_branch:
     description: 'The branch the app was built on'
     required: true
@@ -31,16 +27,8 @@ runs:
         podman rm pulp
       shell: bash
 
-    - name: Test the image in s6 mode (galaxy)
-      if: inputs.image_name == 'galaxy'
-      run: |
-        images/s6_assets/test.sh "pulp/${{ inputs.image_name }}:ci-amd64" https
-        podman stop pulp
-        podman rm pulp
-      shell: bash
-
     - name: Test Compose up
-      if: inputs.image_name == 'pulp-minimal' || inputs.image_name == 'galaxy-minimal'
+      if: inputs.image_name == 'pulp-minimal'
       run: |
         base_image=$(echo ${{ inputs.image_name }} | cut -d '-' -f1)
         images/compose/test.sh "${{ inputs.image_name }}:ci-amd64" "${base_image}-web:ci-amd64" "compose.yml"

.github/workflows/ci.yml

@@ -50,20 +50,8 @@ jobs:
   base-images:
     runs-on: ubuntu-latest
     outputs:
-      image_variants: "${{ steps.image_variants.outputs.image_variants }}"
       base_cache_key: "${{ steps.build_base_images.outputs.base_cache_key }}"
     steps:
-      # We do not want to build nightly images unless it's a PR to the latest branch,
-      # or a branch/dispatch build on the latest branch.
-      - name: Set the list of image_variants for later jobs
-        id: image_variants
-        run: |
-          if [ "${{ github.base_ref }}" == "latest" ] || [ "${{ github.ref_name }}" == "latest" ]; then
-            echo "image_variants=[\"nightly\",\"stable\"]" >> "$GITHUB_OUTPUT"
-          else
-            echo "image_variants=[\"stable\"]" >> "$GITHUB_OUTPUT"
-          fi
-
       - uses: actions/checkout@v4
 
       - name: Build base images
@@ -81,12 +69,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        image_variant: ${{ fromJSON(needs.base-images.outputs.image_variants) }}
         image_name:
           - pulp-minimal
           - pulp
-          - galaxy-minimal
-          - galaxy
     steps:
       - uses: actions/checkout@v4
 
@@ -95,14 +80,13 @@ jobs:
         uses: "./.github/actions/build_image"
         with:
           image_name: ${{ matrix.image_name }}
-          image_variant: ${{ matrix.image_variant }}
+          image_variant: "stable"
           image_cache_key: ${{ needs.base-images.outputs.base_cache_key }}
 
       - name: Test App Image
         uses: "./.github/actions/test_image"
         with:
           image_name: ${{ matrix.image_name }}
-          image_variant: ${{ matrix.image_variant }}
           app_branch: ${{ steps.build_image.outputs.app_branch }}
 
       - name: Logs

.github/workflows/release.yml

@@ -162,8 +162,6 @@ jobs:
         image_name:
           - pulp-minimal
           - pulp
-          - galaxy-minimal
-          - galaxy
     steps:
       - uses: actions/checkout@v4
 
@@ -176,16 +174,16 @@ jobs:
           image_cache_key: ${{ needs.base-images.outputs.base_cache_key }}
 
       - name: Test App Image
+        if: matrix.image_variant != 'nightly'
         uses: "./.github/actions/test_image"
         with:
           image_name: ${{ matrix.image_name }}
-          image_variant: ${{ matrix.image_variant }}
           app_branch: ${{ steps.build_image.outputs.app_branch }}
 
       - name: Set tags
         run: |
           base_image=$(echo ${{ matrix.image_name }} | cut -d '-' -f1)
-          if [[ "${{ matrix.image_name }}" == "pulp" || "${{ matrix.image_name }}" == "galaxy" ]]; then
+          if [[ "${{ matrix.image_name }}" == "pulp" ]]; then
             images="${{ matrix.image_name }}"
           else
             images="${{ matrix.image_name }} ${base_image}-web"

README.md

@@ -4,7 +4,7 @@ The [pulp-oci-images](https://github.com/pulp/pulp-oci-images) repository is use
 These images represent one of the officially supported Pulp installation methods.
 The available images can be divided into two types:
 
-- [Multi-Process Images](multi-process-images) - Images for running a [Pulp](https://github.com/pulp/pulpcore) or [Ansible Galaxy](https://github.com/ansible/galaxy_ng), as well as its [third-party services](#third-party-services),
+- [Multi-Process Images](multi-process-images) - Images for running a [Pulp](https://github.com/pulp/pulpcore), as well as its [third-party services](#third-party-services),
 in a single Docker/Podman container.
 - [Single-Process Images](single-process-images) - Images containing a single Pulp service each, which collectively make up a Pulp instance. They can be used via docker-compose or podman-compose, example [here](https://github.com/pulp/pulp-oci-images/tree/latest/images/compose). These images are also used by [pulp operator](https://pulpproject.org/pulp-operator/).
 
@@ -22,9 +22,6 @@ See the [quickstart guide for deploying](https://pulpproject.org/pulp-oci-images
 | pulp | Multi-Process Pulp with several plugins |
 | pulp-minimal | Single-Process Pulp with several plugins
 | pulp-web | Webserver for pulp-minimal |
-| galaxy | Multi-Process Ansible Galaxy |
-| galaxy-minimal | Single-Process Ansible Galaxy |
-| galaxy-web | Webserver for galaxy-minimal |
 
 ## First-Party Services
 

images/s6_assets/test.sh

@@ -74,8 +74,4 @@ if [ "$old_image" != "" ]; then
 fi
 start_container_and_wait $image
 
-if [[ ${image} != *"galaxy"* ]];then
-  source "$BASEDIR/pulp_tests.sh" $scheme
-else
-  source "$BASEDIR/galaxy_ng_tests.sh" $scheme
-fi
+source "$BASEDIR/pulp_tests.sh" $scheme