移除写死的agent_distro和tools_distro

images/mongodb/inventory.yaml

@@ -10,8 +10,6 @@ images:
       context: .
       template_context: scripts/dev/templates/agent
       # Default values but overwritten in pipeline.py
-      agent_distro: rhel7_x86_64
-      tools_distro: rhel70-x86_64
 
     inputs:
       - release_version
@@ -65,50 +63,6 @@ images:
           - registry: $(inputs.params.registry)/$(inputs.params.image_dev)
             tag: latest-$(inputs.params.architecture)
 
-      - name: agent-template-ubi-s3
-        task_type: dockerfile_template
-        tags: [ "ubi", "release" ]
-        distro: ubi
-
-        inputs:
-          - release_version
-
-        output:
-          - dockerfile: $(inputs.params.s3_bucket)/mongodb-agent/$(inputs.params.release_version)/ubi/Dockerfile
-
-      - name: agent-context-ubi-release
-        task_type: docker_build
-        dockerfile: scripts/dev/templates/agent/Dockerfile.builder
-        tags: [ "ubi", "release" ]
-        buildargs:
-          agent_version: $(inputs.params.release_version)
-          tools_version: $(inputs.params.tools_version)
-          agent_distro: $(inputs.params.agent_distro)
-          tools_distro: $(inputs.params.tools_distro)
-
-        labels:
-          quay.expires-after: Never
-
-        output:
-          - registry: $(inputs.params.registry)/$(inputs.params.image)
-            tag: $(inputs.params.release_version)-context-$(inputs.params.architecture)
-
-      - name: mongodb-agent-release
-        task_type: docker_build
-        tags: [ "ubi", "release" ]
-        dockerfile: scripts/dev/templates/agent/Dockerfile.ubi-$(inputs.params.version_id)
-
-        buildargs:
-          imagebase: $(inputs.params.registry)/$(inputs.params.image):$(inputs.params.release_version)-context-$(inputs.params.architecture)
-          agent_version: $(inputs.params.release_version)
-
-        labels:
-          quay.expires-after: Never
-
-        output:
-          - registry: $(inputs.params.registry)/$(inputs.params.image)
-            tag: $(inputs.params.release_version)-$(inputs.params.architecture)
-
   - name: readiness-probe
     vars:
       context: .
@@ -163,56 +117,6 @@ images:
           - registry: $(inputs.params.registry)/$(inputs.params.image_dev)
             tag: latest-$(inputs.params.architecture)
 
-      - name: readiness-init-context-release
-        task_type: docker_build
-        dockerfile: scripts/dev/templates/readiness/Dockerfile.builder
-        tags: [ "readiness-probe", "release" , "ubi" ]
-
-        labels:
-          quay.expires-after: Never
-
-        buildargs:
-          builder_image: $(inputs.params.builder_image)
-
-        inputs:
-          - release_version
-          - builder_image
-
-        output:
-          - registry: $(inputs.params.registry)/$(inputs.params.image)
-            tag: $(inputs.params.release_version)-context-$(inputs.params.architecture)
-
-      - name: readiness-template-release
-        task_type: dockerfile_template
-        tags: [ "readiness-probe", "release", "ubi" ]
-        template_file_extension: readiness
-        inputs:
-          - base_image
-          - release_version
-
-        output:
-          - dockerfile: scripts/dev/templates/readiness/Dockerfile.readiness-$(inputs.params.release_version)
-          - dockerfile: $(inputs.params.s3_bucket)/mongodb-kubernetes-readinessprobe/$(inputs.params.release_version)/ubi/Dockerfile
-
-      - name: readiness-init-build-release
-        task_type: docker_build
-        dockerfile: scripts/dev/templates/readiness/Dockerfile.readiness-$(inputs.params.release_version)
-        tags: [ "readiness-probe", "release" , "ubi" ]
-
-        buildargs:
-          imagebase: $(inputs.params.registry)/$(inputs.params.image):$(inputs.params.release_version)-context-$(inputs.params.architecture)
-
-        labels:
-          quay.expires-after: Never
-
-        inputs:
-          - base_image
-          - release_version
-
-        output:
-          - registry: $(inputs.params.registry)/$(inputs.params.image)
-            tag: $(inputs.params.release_version)-$(inputs.params.architecture)
-
   - name: version-upgrade-hook
     vars:
       context: .
@@ -266,53 +170,3 @@ images:
             tag: $(inputs.params.version_id)-$(inputs.params.architecture)
           - registry: $(inputs.params.registry)/$(inputs.params.image_dev)
             tag: latest-$(inputs.params.architecture)
-
-      - name: version-upgrade-hook-context-release
-        task_type: docker_build
-        dockerfile: scripts/dev/templates/versionhook/Dockerfile.builder
-        tags: [ "release", "post-start-hook",  "ubi", ]
-
-        labels:
-          quay.expires-after: Never
-
-        buildargs:
-          builder_image: $(inputs.params.builder_image)
-
-        inputs:
-          - release_version
-          - builder_image
-
-        output:
-          - registry: $(inputs.params.registry)/$(inputs.params.image)
-            tag: $(inputs.params.release_version)-context-$(inputs.params.architecture)
-
-      - name: versionhook-template-release
-        task_type: dockerfile_template
-        tags: [ "post-start-hook", "release", "ubi" ]
-        template_file_extension: versionhook
-        inputs:
-          - base_image
-          - release_version
-
-        output:
-          - dockerfile: scripts/dev/templates/versionhook/Dockerfile.versionhook-$(inputs.params.release_version)
-          - dockerfile: $(inputs.params.s3_bucket)/mongodb-kubernetes-operator-version-upgrade-post-start-hook/$(inputs.params.release_version)/ubi/Dockerfile
-
-      - name: version-upgrade-hook-build-release
-        task_type: docker_build
-        dockerfile: scripts/dev/templates/versionhook/Dockerfile.versionhook-$(inputs.params.release_version)
-        tags: [ "release", "post-start-hook",  "ubi" ]
-
-        buildargs:
-          imagebase: $(inputs.params.registry)/$(inputs.params.image):$(inputs.params.release_version)-context-$(inputs.params.architecture)
-
-        labels:
-          quay.expires-after: Never
-
-        inputs:
-          - base_image
-          - release_version
-
-        output:
-          - registry: $(inputs.params.registry)/$(inputs.params.image)
-            tag: $(inputs.params.release_version)-$(inputs.params.architecture)