diff --git a/ci-operator/config/osac-project/fulfillment-service/osac-project-fulfillment-service-main.yaml b/ci-operator/config/osac-project/fulfillment-service/osac-project-fulfillment-service-main.yaml index de0a5b5cb24c7..1793a248c6bd0 100644 --- a/ci-operator/config/osac-project/fulfillment-service/osac-project-fulfillment-service-main.yaml +++ b/ci-operator/config/osac-project/fulfillment-service/osac-project-fulfillment-service-main.yaml @@ -1,28 +1,4 @@ base_images: - assisted-image-service: - name: backplane-5.0 - namespace: edge-infrastructure - tag: assisted-image-service - assisted-installer: - name: backplane-5.0 - namespace: edge-infrastructure - tag: assisted-installer - assisted-installer-agent: - name: backplane-5.0 - namespace: edge-infrastructure - tag: assisted-installer-agent - assisted-installer-controller: - name: backplane-5.0 - namespace: edge-infrastructure - tag: assisted-installer-controller - assisted-service: - name: backplane-5.0 - namespace: edge-infrastructure - tag: assisted-service - assisted-test-infra: - name: backplane-5.0 - namespace: edge-infrastructure - tag: assisted-test-infra dev-scripts: name: test namespace: ocp-kni @@ -98,174 +74,17 @@ tests: commands: echo "Test" container: from: src -- as: e2e-metal-vmaas-compute-instance-creation +- as: e2e-metal-vmaas-all capabilities: - intranet steps: - cluster_profile: packet-assisted dependencies: COMPONENT_IMAGE: fulfillment-service-pr OSAC_INSTALLER_IMAGE: osac-installer-with-pr + OSAC_TEST_IMAGE: osac-test-infra env: - ASSISTED_CONFIG: | - OLM_OPERATORS=cnv,lvm - NUM_MASTERS=1 - NUM_WORKERS=0 - MASTER_MEMORY=57344 - MASTER_DISK_COUNT=2 - MASTER_DISK=200000000000 - MASTER_CPU=24 - OPENSHIFT_VERSION=4.20 COMPONENT_IMAGE_NAME: ghcr.io/osac-project/fulfillment-service - TEST: test_compute_instance_creation.py - workflow: osac-project-ofcir-baremetal-component -- as: e2e-metal-vmaas-compute-instance-api-fields - capabilities: - - intranet - steps: - cluster_profile: packet-assisted - dependencies: - COMPONENT_IMAGE: fulfillment-service-pr - OSAC_INSTALLER_IMAGE: osac-installer-with-pr - env: - ASSISTED_CONFIG: | - OLM_OPERATORS=cnv,lvm - NUM_MASTERS=1 - NUM_WORKERS=0 - MASTER_MEMORY=57344 - MASTER_DISK_COUNT=2 - MASTER_DISK=200000000000 - MASTER_CPU=24 - OPENSHIFT_VERSION=4.20 - COMPONENT_IMAGE_NAME: ghcr.io/osac-project/fulfillment-service - TEST: test_compute_instance_api_fields.py - workflow: osac-project-ofcir-baremetal-component -- as: e2e-metal-vmaas-compute-instance-cli-fields - capabilities: - - intranet - steps: - cluster_profile: packet-assisted - dependencies: - COMPONENT_IMAGE: fulfillment-service-pr - OSAC_INSTALLER_IMAGE: osac-installer-with-pr - env: - ASSISTED_CONFIG: | - OLM_OPERATORS=cnv,lvm - NUM_MASTERS=1 - NUM_WORKERS=0 - MASTER_MEMORY=57344 - MASTER_DISK_COUNT=2 - MASTER_DISK=200000000000 - MASTER_CPU=24 - OPENSHIFT_VERSION=4.20 - COMPONENT_IMAGE_NAME: ghcr.io/osac-project/fulfillment-service - TEST: test_compute_instance_cli_fields.py - workflow: osac-project-ofcir-baremetal-component -- as: e2e-metal-vmaas-compute-instance-delete-during-provision - capabilities: - - intranet - steps: - cluster_profile: packet-assisted - dependencies: - COMPONENT_IMAGE: fulfillment-service-pr - OSAC_INSTALLER_IMAGE: osac-installer-with-pr - env: - ASSISTED_CONFIG: | - OLM_OPERATORS=cnv,lvm - NUM_MASTERS=1 - NUM_WORKERS=0 - MASTER_MEMORY=57344 - MASTER_DISK_COUNT=2 - MASTER_DISK=200000000000 - MASTER_CPU=24 - OPENSHIFT_VERSION=4.20 - COMPONENT_IMAGE_NAME: ghcr.io/osac-project/fulfillment-service - TEST: test_compute_instance_delete_during_provision.py - workflow: osac-project-ofcir-baremetal-component -- as: e2e-metal-vmaas-compute-instance-restart - capabilities: - - intranet - steps: - cluster_profile: packet-assisted - dependencies: - COMPONENT_IMAGE: fulfillment-service-pr - OSAC_INSTALLER_IMAGE: osac-installer-with-pr - env: - ASSISTED_CONFIG: | - OLM_OPERATORS=cnv,lvm - NUM_MASTERS=1 - NUM_WORKERS=0 - MASTER_MEMORY=57344 - MASTER_DISK_COUNT=2 - MASTER_DISK=200000000000 - MASTER_CPU=24 - OPENSHIFT_VERSION=4.20 - COMPONENT_IMAGE_NAME: ghcr.io/osac-project/fulfillment-service - TEST: test_compute_instance_restart.py - workflow: osac-project-ofcir-baremetal-component -- as: e2e-metal-vmaas-compute-instance-restart-negative - capabilities: - - intranet - steps: - cluster_profile: packet-assisted - dependencies: - COMPONENT_IMAGE: fulfillment-service-pr - OSAC_INSTALLER_IMAGE: osac-installer-with-pr - env: - ASSISTED_CONFIG: | - OLM_OPERATORS=cnv,lvm - NUM_MASTERS=1 - NUM_WORKERS=0 - MASTER_MEMORY=57344 - MASTER_DISK_COUNT=2 - MASTER_DISK=200000000000 - MASTER_CPU=24 - OPENSHIFT_VERSION=4.20 - COMPONENT_IMAGE_NAME: ghcr.io/osac-project/fulfillment-service - TEST: test_compute_instance_restart_negative.py - workflow: osac-project-ofcir-baremetal-component -- as: e2e-metal-vmaas-subnet-lifecycle - capabilities: - - intranet - steps: - cluster_profile: packet-assisted - dependencies: - COMPONENT_IMAGE: fulfillment-service-pr - OSAC_INSTALLER_IMAGE: osac-installer-with-pr - env: - ASSISTED_CONFIG: | - OLM_OPERATORS=cnv,lvm - NUM_MASTERS=1 - NUM_WORKERS=0 - MASTER_MEMORY=57344 - MASTER_DISK_COUNT=2 - MASTER_DISK=200000000000 - MASTER_CPU=24 - OPENSHIFT_VERSION=4.20 - COMPONENT_IMAGE_NAME: ghcr.io/osac-project/fulfillment-service - TEST: test_subnet_lifecycle.py - workflow: osac-project-ofcir-baremetal-component -- as: e2e-metal-vmaas-virtual-network-lifecycle - capabilities: - - intranet - steps: - cluster_profile: packet-assisted - dependencies: - COMPONENT_IMAGE: fulfillment-service-pr - OSAC_INSTALLER_IMAGE: osac-installer-with-pr - env: - ASSISTED_CONFIG: | - OLM_OPERATORS=cnv,lvm - NUM_MASTERS=1 - NUM_WORKERS=0 - MASTER_MEMORY=57344 - MASTER_DISK_COUNT=2 - MASTER_DISK=200000000000 - MASTER_CPU=24 - OPENSHIFT_VERSION=4.20 - COMPONENT_IMAGE_NAME: ghcr.io/osac-project/fulfillment-service - TEST: test_virtual_network_lifecycle.py - workflow: osac-project-ofcir-baremetal-component + workflow: osac-project-cluster-tool-vmaas zz_generated_metadata: branch: main org: osac-project diff --git a/ci-operator/config/osac-project/osac-installer/osac-project-osac-installer-main.yaml b/ci-operator/config/osac-project/osac-installer/osac-project-osac-installer-main.yaml index 5c6abebc2be49..489010d624302 100644 --- a/ci-operator/config/osac-project/osac-installer/osac-project-osac-installer-main.yaml +++ b/ci-operator/config/osac-project/osac-installer/osac-project-osac-installer-main.yaml @@ -1,28 +1,4 @@ base_images: - assisted-image-service: - name: backplane-5.0 - namespace: edge-infrastructure - tag: assisted-image-service - assisted-installer: - name: backplane-5.0 - namespace: edge-infrastructure - tag: assisted-installer - assisted-installer-agent: - name: backplane-5.0 - namespace: edge-infrastructure - tag: assisted-installer-agent - assisted-installer-controller: - name: backplane-5.0 - namespace: edge-infrastructure - tag: assisted-installer-controller - assisted-service: - name: backplane-5.0 - namespace: edge-infrastructure - tag: assisted-service - assisted-test-infra: - name: backplane-5.0 - namespace: edge-infrastructure - tag: assisted-test-infra dev-scripts: name: test namespace: ocp-kni @@ -68,9 +44,13 @@ images: - destination_dir: . source_path: /app/osac to: osac-installer + - dockerfile_literal: FROM scratch + to: component-image promotion: to: - - name: latest + - excluded_images: + - component-image + name: latest namespace: osac-project releases: latest: @@ -86,150 +66,15 @@ resources: cpu: 100m memory: 200Mi tests: -- as: e2e-metal-vmaas-compute-instance-creation - capabilities: - - intranet - run_if_changed: ^(base/|overlays/|scripts/|prerequisites/) - steps: - cluster_profile: packet-assisted - env: - ASSISTED_CONFIG: | - OLM_OPERATORS=cnv,lvm - NUM_MASTERS=1 - NUM_WORKERS=0 - MASTER_MEMORY=57344 - MASTER_DISK_COUNT=2 - MASTER_DISK=200000000000 - MASTER_CPU=24 - OPENSHIFT_VERSION=4.20 - TEST: test_compute_instance_creation.py - workflow: osac-project-ofcir-baremetal -- as: e2e-metal-vmaas-compute-instance-api-fields - capabilities: - - intranet - run_if_changed: ^(base/|overlays/|scripts/|prerequisites/) - steps: - cluster_profile: packet-assisted - env: - ASSISTED_CONFIG: | - OLM_OPERATORS=cnv,lvm - NUM_MASTERS=1 - NUM_WORKERS=0 - MASTER_MEMORY=57344 - MASTER_DISK_COUNT=2 - MASTER_DISK=200000000000 - MASTER_CPU=24 - OPENSHIFT_VERSION=4.20 - TEST: test_compute_instance_api_fields.py - workflow: osac-project-ofcir-baremetal -- as: e2e-metal-vmaas-compute-instance-cli-fields - capabilities: - - intranet - run_if_changed: ^(base/|overlays/|scripts/|prerequisites/) - steps: - cluster_profile: packet-assisted - env: - ASSISTED_CONFIG: | - OLM_OPERATORS=cnv,lvm - NUM_MASTERS=1 - NUM_WORKERS=0 - MASTER_MEMORY=57344 - MASTER_DISK_COUNT=2 - MASTER_DISK=200000000000 - MASTER_CPU=24 - OPENSHIFT_VERSION=4.20 - TEST: test_compute_instance_cli_fields.py - workflow: osac-project-ofcir-baremetal -- as: e2e-metal-vmaas-compute-instance-delete-during-provision - capabilities: - - intranet - run_if_changed: ^(base/|overlays/|scripts/|prerequisites/) - steps: - cluster_profile: packet-assisted - env: - ASSISTED_CONFIG: | - OLM_OPERATORS=cnv,lvm - NUM_MASTERS=1 - NUM_WORKERS=0 - MASTER_MEMORY=57344 - MASTER_DISK_COUNT=2 - MASTER_DISK=200000000000 - MASTER_CPU=24 - OPENSHIFT_VERSION=4.20 - TEST: test_compute_instance_delete_during_provision.py - workflow: osac-project-ofcir-baremetal -- as: e2e-metal-vmaas-compute-instance-restart - capabilities: - - intranet - run_if_changed: ^(base/|overlays/|scripts/|prerequisites/) - steps: - cluster_profile: packet-assisted - env: - ASSISTED_CONFIG: | - OLM_OPERATORS=cnv,lvm - NUM_MASTERS=1 - NUM_WORKERS=0 - MASTER_MEMORY=57344 - MASTER_DISK_COUNT=2 - MASTER_DISK=200000000000 - MASTER_CPU=24 - OPENSHIFT_VERSION=4.20 - TEST: test_compute_instance_restart.py - workflow: osac-project-ofcir-baremetal -- as: e2e-metal-vmaas-compute-instance-restart-negative - capabilities: - - intranet - run_if_changed: ^(base/|overlays/|scripts/|prerequisites/) - steps: - cluster_profile: packet-assisted - env: - ASSISTED_CONFIG: | - OLM_OPERATORS=cnv,lvm - NUM_MASTERS=1 - NUM_WORKERS=0 - MASTER_MEMORY=57344 - MASTER_DISK_COUNT=2 - MASTER_DISK=200000000000 - MASTER_CPU=24 - OPENSHIFT_VERSION=4.20 - TEST: test_compute_instance_restart_negative.py - workflow: osac-project-ofcir-baremetal -- as: e2e-metal-vmaas-subnet-lifecycle - capabilities: - - intranet - run_if_changed: ^(base/|overlays/|scripts/|prerequisites/) - steps: - cluster_profile: packet-assisted - env: - ASSISTED_CONFIG: | - OLM_OPERATORS=cnv,lvm - NUM_MASTERS=1 - NUM_WORKERS=0 - MASTER_MEMORY=57344 - MASTER_DISK_COUNT=2 - MASTER_DISK=200000000000 - MASTER_CPU=24 - OPENSHIFT_VERSION=4.20 - TEST: test_subnet_lifecycle.py - workflow: osac-project-ofcir-baremetal -- as: e2e-metal-vmaas-virtual-network-lifecycle +- as: e2e-metal-vmaas-all capabilities: - intranet run_if_changed: ^(base/|overlays/|scripts/|prerequisites/) steps: - cluster_profile: packet-assisted - env: - ASSISTED_CONFIG: | - OLM_OPERATORS=cnv,lvm - NUM_MASTERS=1 - NUM_WORKERS=0 - MASTER_MEMORY=57344 - MASTER_DISK_COUNT=2 - MASTER_DISK=200000000000 - MASTER_CPU=24 - OPENSHIFT_VERSION=4.20 - TEST: test_virtual_network_lifecycle.py - workflow: osac-project-ofcir-baremetal + dependencies: + OSAC_INSTALLER_IMAGE: osac-installer + OSAC_TEST_IMAGE: osac-test-infra + workflow: osac-project-cluster-tool-vmaas zz_generated_metadata: branch: main org: osac-project diff --git a/ci-operator/config/osac-project/osac-operator/osac-project-osac-operator-main.yaml b/ci-operator/config/osac-project/osac-operator/osac-project-osac-operator-main.yaml index 2cebc02a85d9c..744d79af8a521 100644 --- a/ci-operator/config/osac-project/osac-operator/osac-project-osac-operator-main.yaml +++ b/ci-operator/config/osac-project/osac-operator/osac-project-osac-operator-main.yaml @@ -1,28 +1,4 @@ base_images: - assisted-image-service: - name: backplane-5.0 - namespace: edge-infrastructure - tag: assisted-image-service - assisted-installer: - name: backplane-5.0 - namespace: edge-infrastructure - tag: assisted-installer - assisted-installer-agent: - name: backplane-5.0 - namespace: edge-infrastructure - tag: assisted-installer-agent - assisted-installer-controller: - name: backplane-5.0 - namespace: edge-infrastructure - tag: assisted-installer-controller - assisted-service: - name: backplane-5.0 - namespace: edge-infrastructure - tag: assisted-service - assisted-test-infra: - name: backplane-5.0 - namespace: edge-infrastructure - tag: assisted-test-infra dev-scripts: name: test namespace: ocp-kni @@ -75,174 +51,17 @@ resources: cpu: 100m memory: 200Mi tests: -- as: e2e-metal-vmaas-compute-instance-creation +- as: e2e-metal-vmaas-all capabilities: - intranet steps: - cluster_profile: packet-assisted dependencies: COMPONENT_IMAGE: osac-operator-pr OSAC_INSTALLER_IMAGE: osac-installer-with-pr + OSAC_TEST_IMAGE: osac-test-infra env: - ASSISTED_CONFIG: | - OLM_OPERATORS=cnv,lvm - NUM_MASTERS=1 - NUM_WORKERS=0 - MASTER_MEMORY=57344 - MASTER_DISK_COUNT=2 - MASTER_DISK=200000000000 - MASTER_CPU=24 - OPENSHIFT_VERSION=4.20 COMPONENT_IMAGE_NAME: ghcr.io/osac-project/osac-operator - TEST: test_compute_instance_creation.py - workflow: osac-project-ofcir-baremetal-component -- as: e2e-metal-vmaas-compute-instance-api-fields - capabilities: - - intranet - steps: - cluster_profile: packet-assisted - dependencies: - COMPONENT_IMAGE: osac-operator-pr - OSAC_INSTALLER_IMAGE: osac-installer-with-pr - env: - ASSISTED_CONFIG: | - OLM_OPERATORS=cnv,lvm - NUM_MASTERS=1 - NUM_WORKERS=0 - MASTER_MEMORY=57344 - MASTER_DISK_COUNT=2 - MASTER_DISK=200000000000 - MASTER_CPU=24 - OPENSHIFT_VERSION=4.20 - COMPONENT_IMAGE_NAME: ghcr.io/osac-project/osac-operator - TEST: test_compute_instance_api_fields.py - workflow: osac-project-ofcir-baremetal-component -- as: e2e-metal-vmaas-compute-instance-cli-fields - capabilities: - - intranet - steps: - cluster_profile: packet-assisted - dependencies: - COMPONENT_IMAGE: osac-operator-pr - OSAC_INSTALLER_IMAGE: osac-installer-with-pr - env: - ASSISTED_CONFIG: | - OLM_OPERATORS=cnv,lvm - NUM_MASTERS=1 - NUM_WORKERS=0 - MASTER_MEMORY=57344 - MASTER_DISK_COUNT=2 - MASTER_DISK=200000000000 - MASTER_CPU=24 - OPENSHIFT_VERSION=4.20 - COMPONENT_IMAGE_NAME: ghcr.io/osac-project/osac-operator - TEST: test_compute_instance_cli_fields.py - workflow: osac-project-ofcir-baremetal-component -- as: e2e-metal-vmaas-compute-instance-delete-during-provision - capabilities: - - intranet - steps: - cluster_profile: packet-assisted - dependencies: - COMPONENT_IMAGE: osac-operator-pr - OSAC_INSTALLER_IMAGE: osac-installer-with-pr - env: - ASSISTED_CONFIG: | - OLM_OPERATORS=cnv,lvm - NUM_MASTERS=1 - NUM_WORKERS=0 - MASTER_MEMORY=57344 - MASTER_DISK_COUNT=2 - MASTER_DISK=200000000000 - MASTER_CPU=24 - OPENSHIFT_VERSION=4.20 - COMPONENT_IMAGE_NAME: ghcr.io/osac-project/osac-operator - TEST: test_compute_instance_delete_during_provision.py - workflow: osac-project-ofcir-baremetal-component -- as: e2e-metal-vmaas-compute-instance-restart - capabilities: - - intranet - steps: - cluster_profile: packet-assisted - dependencies: - COMPONENT_IMAGE: osac-operator-pr - OSAC_INSTALLER_IMAGE: osac-installer-with-pr - env: - ASSISTED_CONFIG: | - OLM_OPERATORS=cnv,lvm - NUM_MASTERS=1 - NUM_WORKERS=0 - MASTER_MEMORY=57344 - MASTER_DISK_COUNT=2 - MASTER_DISK=200000000000 - MASTER_CPU=24 - OPENSHIFT_VERSION=4.20 - COMPONENT_IMAGE_NAME: ghcr.io/osac-project/osac-operator - TEST: test_compute_instance_restart.py - workflow: osac-project-ofcir-baremetal-component -- as: e2e-metal-vmaas-compute-instance-restart-negative - capabilities: - - intranet - steps: - cluster_profile: packet-assisted - dependencies: - COMPONENT_IMAGE: osac-operator-pr - OSAC_INSTALLER_IMAGE: osac-installer-with-pr - env: - ASSISTED_CONFIG: | - OLM_OPERATORS=cnv,lvm - NUM_MASTERS=1 - NUM_WORKERS=0 - MASTER_MEMORY=57344 - MASTER_DISK_COUNT=2 - MASTER_DISK=200000000000 - MASTER_CPU=24 - OPENSHIFT_VERSION=4.20 - COMPONENT_IMAGE_NAME: ghcr.io/osac-project/osac-operator - TEST: test_compute_instance_restart_negative.py - workflow: osac-project-ofcir-baremetal-component -- as: e2e-metal-vmaas-subnet-lifecycle - capabilities: - - intranet - steps: - cluster_profile: packet-assisted - dependencies: - COMPONENT_IMAGE: osac-operator-pr - OSAC_INSTALLER_IMAGE: osac-installer-with-pr - env: - ASSISTED_CONFIG: | - OLM_OPERATORS=cnv,lvm - NUM_MASTERS=1 - NUM_WORKERS=0 - MASTER_MEMORY=57344 - MASTER_DISK_COUNT=2 - MASTER_DISK=200000000000 - MASTER_CPU=24 - OPENSHIFT_VERSION=4.20 - COMPONENT_IMAGE_NAME: ghcr.io/osac-project/osac-operator - TEST: test_subnet_lifecycle.py - workflow: osac-project-ofcir-baremetal-component -- as: e2e-metal-vmaas-virtual-network-lifecycle - capabilities: - - intranet - steps: - cluster_profile: packet-assisted - dependencies: - COMPONENT_IMAGE: osac-operator-pr - OSAC_INSTALLER_IMAGE: osac-installer-with-pr - env: - ASSISTED_CONFIG: | - OLM_OPERATORS=cnv,lvm - NUM_MASTERS=1 - NUM_WORKERS=0 - MASTER_MEMORY=57344 - MASTER_DISK_COUNT=2 - MASTER_DISK=200000000000 - MASTER_CPU=24 - OPENSHIFT_VERSION=4.20 - COMPONENT_IMAGE_NAME: ghcr.io/osac-project/osac-operator - TEST: test_virtual_network_lifecycle.py - workflow: osac-project-ofcir-baremetal-component + workflow: osac-project-cluster-tool-vmaas zz_generated_metadata: branch: main org: osac-project diff --git a/ci-operator/config/osac-project/osac-test-infra/osac-project-osac-test-infra-main.yaml b/ci-operator/config/osac-project/osac-test-infra/osac-project-osac-test-infra-main.yaml index 6ea1461c43bda..75c153ba22786 100644 --- a/ci-operator/config/osac-project/osac-test-infra/osac-project-osac-test-infra-main.yaml +++ b/ci-operator/config/osac-project/osac-test-infra/osac-project-osac-test-infra-main.yaml @@ -1,28 +1,4 @@ base_images: - assisted-image-service: - name: backplane-5.0 - namespace: edge-infrastructure - tag: assisted-image-service - assisted-installer: - name: backplane-5.0 - namespace: edge-infrastructure - tag: assisted-installer - assisted-installer-agent: - name: backplane-5.0 - namespace: edge-infrastructure - tag: assisted-installer-agent - assisted-installer-controller: - name: backplane-5.0 - namespace: edge-infrastructure - tag: assisted-installer-controller - assisted-service: - name: backplane-5.0 - namespace: edge-infrastructure - tag: assisted-service - assisted-test-infra: - name: backplane-5.0 - namespace: edge-infrastructure - tag: assisted-test-infra dev-scripts: name: test namespace: ocp-kni @@ -40,9 +16,13 @@ images: items: - dockerfile_path: Containerfile to: osac-test-infra + - dockerfile_literal: FROM scratch + to: component-image promotion: to: - - name: latest + - excluded_images: + - component-image + name: latest namespace: osac-project releases: latest: @@ -58,286 +38,17 @@ resources: cpu: 100m memory: 200Mi tests: -- as: e2e-metal-vmaas-compute-instance-creation-pr - capabilities: - - intranet - steps: - cluster_profile: packet-assisted - env: - ASSISTED_CONFIG: | - OLM_OPERATORS=cnv,lvm - NUM_MASTERS=1 - NUM_WORKERS=0 - MASTER_MEMORY=57344 - MASTER_DISK_COUNT=2 - MASTER_DISK=200000000000 - MASTER_CPU=24 - OPENSHIFT_VERSION=4.20 - TEST: test_compute_instance_creation.py - workflow: osac-project-ofcir-baremetal -- as: e2e-metal-vmaas-compute-instance-api-fields-pr - capabilities: - - intranet - steps: - cluster_profile: packet-assisted - env: - ASSISTED_CONFIG: | - OLM_OPERATORS=cnv,lvm - NUM_MASTERS=1 - NUM_WORKERS=0 - MASTER_MEMORY=57344 - MASTER_DISK_COUNT=2 - MASTER_DISK=200000000000 - MASTER_CPU=24 - OPENSHIFT_VERSION=4.20 - TEST: test_compute_instance_api_fields.py - workflow: osac-project-ofcir-baremetal -- as: e2e-metal-vmaas-compute-instance-cli-fields-pr - capabilities: - - intranet - steps: - cluster_profile: packet-assisted - env: - ASSISTED_CONFIG: | - OLM_OPERATORS=cnv,lvm - NUM_MASTERS=1 - NUM_WORKERS=0 - MASTER_MEMORY=57344 - MASTER_DISK_COUNT=2 - MASTER_DISK=200000000000 - MASTER_CPU=24 - OPENSHIFT_VERSION=4.20 - TEST: test_compute_instance_cli_fields.py - workflow: osac-project-ofcir-baremetal -- as: e2e-metal-vmaas-compute-instance-del-during-prov-pr - capabilities: - - intranet - steps: - cluster_profile: packet-assisted - env: - ASSISTED_CONFIG: | - OLM_OPERATORS=cnv,lvm - NUM_MASTERS=1 - NUM_WORKERS=0 - MASTER_MEMORY=57344 - MASTER_DISK_COUNT=2 - MASTER_DISK=200000000000 - MASTER_CPU=24 - OPENSHIFT_VERSION=4.20 - TEST: test_compute_instance_delete_during_provision.py - workflow: osac-project-ofcir-baremetal -- as: e2e-metal-vmaas-compute-instance-restart-pr - capabilities: - - intranet - steps: - cluster_profile: packet-assisted - env: - ASSISTED_CONFIG: | - OLM_OPERATORS=cnv,lvm - NUM_MASTERS=1 - NUM_WORKERS=0 - MASTER_MEMORY=57344 - MASTER_DISK_COUNT=2 - MASTER_DISK=200000000000 - MASTER_CPU=24 - OPENSHIFT_VERSION=4.20 - TEST: test_compute_instance_restart.py - workflow: osac-project-ofcir-baremetal -- as: e2e-metal-vmaas-compute-instance-restart-neg-pr - capabilities: - - intranet - steps: - cluster_profile: packet-assisted - env: - ASSISTED_CONFIG: | - OLM_OPERATORS=cnv,lvm - NUM_MASTERS=1 - NUM_WORKERS=0 - MASTER_MEMORY=57344 - MASTER_DISK_COUNT=2 - MASTER_DISK=200000000000 - MASTER_CPU=24 - OPENSHIFT_VERSION=4.20 - TEST: test_compute_instance_restart_negative.py - workflow: osac-project-ofcir-baremetal -- as: e2e-metal-vmaas-subnet-lifecycle-pr - capabilities: - - intranet - steps: - cluster_profile: packet-assisted - env: - ASSISTED_CONFIG: | - OLM_OPERATORS=cnv,lvm - NUM_MASTERS=1 - NUM_WORKERS=0 - MASTER_MEMORY=57344 - MASTER_DISK_COUNT=2 - MASTER_DISK=200000000000 - MASTER_CPU=24 - OPENSHIFT_VERSION=4.20 - TEST: test_subnet_lifecycle.py - workflow: osac-project-ofcir-baremetal -- as: e2e-metal-vmaas-virtual-network-lifecycle-pr +- as: e2e-metal-vmaas-all capabilities: - intranet steps: - cluster_profile: packet-assisted - env: - ASSISTED_CONFIG: | - OLM_OPERATORS=cnv,lvm - NUM_MASTERS=1 - NUM_WORKERS=0 - MASTER_MEMORY=57344 - MASTER_DISK_COUNT=2 - MASTER_DISK=200000000000 - MASTER_CPU=24 - OPENSHIFT_VERSION=4.20 - TEST: test_virtual_network_lifecycle.py - workflow: osac-project-ofcir-baremetal -- as: e2e-metal-vmaas-compute-instance-creation + workflow: osac-project-cluster-tool-vmaas +- as: e2e-metal-vmaas-all-periodic capabilities: - intranet cron: 0 2 * * 1 steps: - cluster_profile: packet-assisted - env: - ASSISTED_CONFIG: | - OLM_OPERATORS=cnv,lvm - NUM_MASTERS=1 - NUM_WORKERS=0 - MASTER_MEMORY=57344 - MASTER_DISK_COUNT=2 - MASTER_DISK=200000000000 - MASTER_CPU=24 - OPENSHIFT_VERSION=4.20 - TEST: test_compute_instance_creation.py - workflow: osac-project-ofcir-baremetal -- as: e2e-metal-vmaas-compute-instance-api-fields - capabilities: - - intranet - cron: 0 6 * * 1 - steps: - cluster_profile: packet-assisted - env: - ASSISTED_CONFIG: | - OLM_OPERATORS=cnv,lvm - NUM_MASTERS=1 - NUM_WORKERS=0 - MASTER_MEMORY=57344 - MASTER_DISK_COUNT=2 - MASTER_DISK=200000000000 - MASTER_CPU=24 - OPENSHIFT_VERSION=4.20 - TEST: test_compute_instance_api_fields.py - workflow: osac-project-ofcir-baremetal -- as: e2e-metal-vmaas-compute-instance-cli-fields - capabilities: - - intranet - cron: 0 2 * * 2 - steps: - cluster_profile: packet-assisted - env: - ASSISTED_CONFIG: | - OLM_OPERATORS=cnv,lvm - NUM_MASTERS=1 - NUM_WORKERS=0 - MASTER_MEMORY=57344 - MASTER_DISK_COUNT=2 - MASTER_DISK=200000000000 - MASTER_CPU=24 - OPENSHIFT_VERSION=4.20 - TEST: test_compute_instance_cli_fields.py - workflow: osac-project-ofcir-baremetal -- as: e2e-metal-vmaas-compute-instance-delete-during-provision - capabilities: - - intranet - cron: 0 6 * * 2 - steps: - cluster_profile: packet-assisted - env: - ASSISTED_CONFIG: | - OLM_OPERATORS=cnv,lvm - NUM_MASTERS=1 - NUM_WORKERS=0 - MASTER_MEMORY=57344 - MASTER_DISK_COUNT=2 - MASTER_DISK=200000000000 - MASTER_CPU=24 - OPENSHIFT_VERSION=4.20 - TEST: test_compute_instance_delete_during_provision.py - workflow: osac-project-ofcir-baremetal -- as: e2e-metal-vmaas-compute-instance-restart - capabilities: - - intranet - cron: 0 2 * * 3 - steps: - cluster_profile: packet-assisted - env: - ASSISTED_CONFIG: | - OLM_OPERATORS=cnv,lvm - NUM_MASTERS=1 - NUM_WORKERS=0 - MASTER_MEMORY=57344 - MASTER_DISK_COUNT=2 - MASTER_DISK=200000000000 - MASTER_CPU=24 - OPENSHIFT_VERSION=4.20 - TEST: test_compute_instance_restart.py - workflow: osac-project-ofcir-baremetal -- as: e2e-metal-vmaas-compute-instance-restart-negative - capabilities: - - intranet - cron: 0 6 * * 3 - steps: - cluster_profile: packet-assisted - env: - ASSISTED_CONFIG: | - OLM_OPERATORS=cnv,lvm - NUM_MASTERS=1 - NUM_WORKERS=0 - MASTER_MEMORY=57344 - MASTER_DISK_COUNT=2 - MASTER_DISK=200000000000 - MASTER_CPU=24 - OPENSHIFT_VERSION=4.20 - TEST: test_compute_instance_restart_negative.py - workflow: osac-project-ofcir-baremetal -- as: e2e-metal-vmaas-subnet-lifecycle - capabilities: - - intranet - cron: 0 2 * * 4 - steps: - cluster_profile: packet-assisted - env: - ASSISTED_CONFIG: | - OLM_OPERATORS=cnv,lvm - NUM_MASTERS=1 - NUM_WORKERS=0 - MASTER_MEMORY=57344 - MASTER_DISK_COUNT=2 - MASTER_DISK=200000000000 - MASTER_CPU=24 - OPENSHIFT_VERSION=4.20 - TEST: test_subnet_lifecycle.py - workflow: osac-project-ofcir-baremetal -- as: e2e-metal-vmaas-virtual-network-lifecycle - capabilities: - - intranet - cron: 0 6 * * 4 - steps: - cluster_profile: packet-assisted - env: - ASSISTED_CONFIG: | - OLM_OPERATORS=cnv,lvm - NUM_MASTERS=1 - NUM_WORKERS=0 - MASTER_MEMORY=57344 - MASTER_DISK_COUNT=2 - MASTER_DISK=200000000000 - MASTER_CPU=24 - OPENSHIFT_VERSION=4.20 - TEST: test_virtual_network_lifecycle.py - workflow: osac-project-ofcir-baremetal + workflow: osac-project-cluster-tool-vmaas zz_generated_metadata: branch: main org: osac-project diff --git a/ci-operator/jobs/osac-project/fulfillment-service/osac-project-fulfillment-service-main-presubmits.yaml b/ci-operator/jobs/osac-project/fulfillment-service/osac-project-fulfillment-service-main-presubmits.yaml index 07a6fe7f09e54..39fdc0ff7e1dd 100644 --- a/ci-operator/jobs/osac-project/fulfillment-service/osac-project-fulfillment-service-main-presubmits.yaml +++ b/ci-operator/jobs/osac-project/fulfillment-service/osac-project-fulfillment-service-main-presubmits.yaml @@ -6,19 +6,17 @@ presubmits: - ^main$ - ^main- cluster: build09 - context: ci/prow/e2e-metal-vmaas-compute-instance-api-fields + context: ci/prow/e2e-metal-vmaas-all decorate: true decoration_config: skip_cloning: true labels: capability/intranet: intranet - ci-operator.openshift.io/cloud: packet-edge - ci-operator.openshift.io/cloud-cluster-profile: packet-assisted ci.openshift.io/generator: prowgen job-release: "4.20" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-osac-project-fulfillment-service-main-e2e-metal-vmaas-compute-instance-api-fields - rerun_command: /test e2e-metal-vmaas-compute-instance-api-fields + name: pull-ci-osac-project-fulfillment-service-main-e2e-metal-vmaas-all + rerun_command: /test e2e-metal-vmaas-all spec: containers: - args: @@ -27,7 +25,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-metal-vmaas-compute-instance-api-fields + - --target=e2e-metal-vmaas-all command: - ci-operator env: @@ -83,601 +81,13 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-metal-vmaas-compute-instance-api-fields,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-metal-vmaas-all,?($|\s.*) - agent: kubernetes always_run: true branches: - ^main$ - ^main- - cluster: build09 - context: ci/prow/e2e-metal-vmaas-compute-instance-cli-fields - decorate: true - decoration_config: - skip_cloning: true - labels: - capability/intranet: intranet - ci-operator.openshift.io/cloud: packet-edge - ci-operator.openshift.io/cloud-cluster-profile: packet-assisted - ci.openshift.io/generator: prowgen - job-release: "4.20" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-osac-project-fulfillment-service-main-e2e-metal-vmaas-compute-instance-cli-fields - rerun_command: /test e2e-metal-vmaas-compute-instance-cli-fields - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-metal-vmaas-compute-instance-cli-fields - command: - - ci-operator - env: - - name: HTTP_SERVER_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - ports: - - containerPort: 8080 - name: http - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-metal-vmaas-compute-instance-cli-fields,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^main$ - - ^main- - cluster: build09 - context: ci/prow/e2e-metal-vmaas-compute-instance-creation - decorate: true - decoration_config: - skip_cloning: true - labels: - capability/intranet: intranet - ci-operator.openshift.io/cloud: packet-edge - ci-operator.openshift.io/cloud-cluster-profile: packet-assisted - ci.openshift.io/generator: prowgen - job-release: "4.20" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-osac-project-fulfillment-service-main-e2e-metal-vmaas-compute-instance-creation - rerun_command: /test e2e-metal-vmaas-compute-instance-creation - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-metal-vmaas-compute-instance-creation - command: - - ci-operator - env: - - name: HTTP_SERVER_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - ports: - - containerPort: 8080 - name: http - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-metal-vmaas-compute-instance-creation,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^main$ - - ^main- - cluster: build09 - context: ci/prow/e2e-metal-vmaas-compute-instance-delete-during-provision - decorate: true - decoration_config: - skip_cloning: true - labels: - capability/intranet: intranet - ci-operator.openshift.io/cloud: packet-edge - ci-operator.openshift.io/cloud-cluster-profile: packet-assisted - ci.openshift.io/generator: prowgen - job-release: "4.20" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-osac-project-fulfillment-service-main-e2e-metal-vmaas-compute-instance-delete-during-provision - rerun_command: /test e2e-metal-vmaas-compute-instance-delete-during-provision - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-metal-vmaas-compute-instance-delete-during-provision - command: - - ci-operator - env: - - name: HTTP_SERVER_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - ports: - - containerPort: 8080 - name: http - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-metal-vmaas-compute-instance-delete-during-provision,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^main$ - - ^main- - cluster: build09 - context: ci/prow/e2e-metal-vmaas-compute-instance-restart - decorate: true - decoration_config: - skip_cloning: true - labels: - capability/intranet: intranet - ci-operator.openshift.io/cloud: packet-edge - ci-operator.openshift.io/cloud-cluster-profile: packet-assisted - ci.openshift.io/generator: prowgen - job-release: "4.20" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-osac-project-fulfillment-service-main-e2e-metal-vmaas-compute-instance-restart - rerun_command: /test e2e-metal-vmaas-compute-instance-restart - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-metal-vmaas-compute-instance-restart - command: - - ci-operator - env: - - name: HTTP_SERVER_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - ports: - - containerPort: 8080 - name: http - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-metal-vmaas-compute-instance-restart,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^main$ - - ^main- - cluster: build09 - context: ci/prow/e2e-metal-vmaas-compute-instance-restart-negative - decorate: true - decoration_config: - skip_cloning: true - labels: - capability/intranet: intranet - ci-operator.openshift.io/cloud: packet-edge - ci-operator.openshift.io/cloud-cluster-profile: packet-assisted - ci.openshift.io/generator: prowgen - job-release: "4.20" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-osac-project-fulfillment-service-main-e2e-metal-vmaas-compute-instance-restart-negative - rerun_command: /test e2e-metal-vmaas-compute-instance-restart-negative - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-metal-vmaas-compute-instance-restart-negative - command: - - ci-operator - env: - - name: HTTP_SERVER_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - ports: - - containerPort: 8080 - name: http - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-metal-vmaas-compute-instance-restart-negative,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^main$ - - ^main- - cluster: build09 - context: ci/prow/e2e-metal-vmaas-subnet-lifecycle - decorate: true - decoration_config: - skip_cloning: true - labels: - capability/intranet: intranet - ci-operator.openshift.io/cloud: packet-edge - ci-operator.openshift.io/cloud-cluster-profile: packet-assisted - ci.openshift.io/generator: prowgen - job-release: "4.20" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-osac-project-fulfillment-service-main-e2e-metal-vmaas-subnet-lifecycle - rerun_command: /test e2e-metal-vmaas-subnet-lifecycle - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-metal-vmaas-subnet-lifecycle - command: - - ci-operator - env: - - name: HTTP_SERVER_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - ports: - - containerPort: 8080 - name: http - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-metal-vmaas-subnet-lifecycle,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^main$ - - ^main- - cluster: build09 - context: ci/prow/e2e-metal-vmaas-virtual-network-lifecycle - decorate: true - decoration_config: - skip_cloning: true - labels: - capability/intranet: intranet - ci-operator.openshift.io/cloud: packet-edge - ci-operator.openshift.io/cloud-cluster-profile: packet-assisted - ci.openshift.io/generator: prowgen - job-release: "4.20" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-osac-project-fulfillment-service-main-e2e-metal-vmaas-virtual-network-lifecycle - rerun_command: /test e2e-metal-vmaas-virtual-network-lifecycle - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-metal-vmaas-virtual-network-lifecycle - command: - - ci-operator - env: - - name: HTTP_SERVER_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - ports: - - containerPort: 8080 - name: http - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-metal-vmaas-virtual-network-lifecycle,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^main$ - - ^main- - cluster: build10 + cluster: build05 context: ci/prow/images decorate: true decoration_config: @@ -733,7 +143,7 @@ presubmits: branches: - ^main$ - ^main- - cluster: build10 + cluster: build05 context: ci/prow/unit decorate: true decoration_config: diff --git a/ci-operator/jobs/osac-project/osac-installer/osac-project-osac-installer-main-presubmits.yaml b/ci-operator/jobs/osac-project/osac-installer/osac-project-osac-installer-main-presubmits.yaml index bd299c95bd5d5..1a9294c7e242a 100644 --- a/ci-operator/jobs/osac-project/osac-installer/osac-project-osac-installer-main-presubmits.yaml +++ b/ci-operator/jobs/osac-project/osac-installer/osac-project-osac-installer-main-presubmits.yaml @@ -6,19 +6,17 @@ presubmits: - ^main$ - ^main- cluster: build11 - context: ci/prow/e2e-metal-vmaas-compute-instance-api-fields + context: ci/prow/e2e-metal-vmaas-all decorate: true decoration_config: skip_cloning: true labels: capability/intranet: intranet - ci-operator.openshift.io/cloud: packet-edge - ci-operator.openshift.io/cloud-cluster-profile: packet-assisted ci.openshift.io/generator: prowgen job-release: "4.20" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-osac-project-osac-installer-main-e2e-metal-vmaas-compute-instance-api-fields - rerun_command: /test e2e-metal-vmaas-compute-instance-api-fields + name: pull-ci-osac-project-osac-installer-main-e2e-metal-vmaas-all + rerun_command: /test e2e-metal-vmaas-all run_if_changed: ^(base/|overlays/|scripts/|prerequisites/) spec: containers: @@ -28,7 +26,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-metal-vmaas-compute-instance-api-fields + - --target=e2e-metal-vmaas-all command: - ci-operator env: @@ -84,602 +82,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-metal-vmaas-compute-instance-api-fields,?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^main$ - - ^main- - cluster: build11 - context: ci/prow/e2e-metal-vmaas-compute-instance-cli-fields - decorate: true - decoration_config: - skip_cloning: true - labels: - capability/intranet: intranet - ci-operator.openshift.io/cloud: packet-edge - ci-operator.openshift.io/cloud-cluster-profile: packet-assisted - ci.openshift.io/generator: prowgen - job-release: "4.20" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-osac-project-osac-installer-main-e2e-metal-vmaas-compute-instance-cli-fields - rerun_command: /test e2e-metal-vmaas-compute-instance-cli-fields - run_if_changed: ^(base/|overlays/|scripts/|prerequisites/) - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-metal-vmaas-compute-instance-cli-fields - command: - - ci-operator - env: - - name: HTTP_SERVER_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - ports: - - containerPort: 8080 - name: http - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-metal-vmaas-compute-instance-cli-fields,?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^main$ - - ^main- - cluster: build11 - context: ci/prow/e2e-metal-vmaas-compute-instance-creation - decorate: true - decoration_config: - skip_cloning: true - labels: - capability/intranet: intranet - ci-operator.openshift.io/cloud: packet-edge - ci-operator.openshift.io/cloud-cluster-profile: packet-assisted - ci.openshift.io/generator: prowgen - job-release: "4.20" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-osac-project-osac-installer-main-e2e-metal-vmaas-compute-instance-creation - rerun_command: /test e2e-metal-vmaas-compute-instance-creation - run_if_changed: ^(base/|overlays/|scripts/|prerequisites/) - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-metal-vmaas-compute-instance-creation - command: - - ci-operator - env: - - name: HTTP_SERVER_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - ports: - - containerPort: 8080 - name: http - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-metal-vmaas-compute-instance-creation,?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^main$ - - ^main- - cluster: build11 - context: ci/prow/e2e-metal-vmaas-compute-instance-delete-during-provision - decorate: true - decoration_config: - skip_cloning: true - labels: - capability/intranet: intranet - ci-operator.openshift.io/cloud: packet-edge - ci-operator.openshift.io/cloud-cluster-profile: packet-assisted - ci.openshift.io/generator: prowgen - job-release: "4.20" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-osac-project-osac-installer-main-e2e-metal-vmaas-compute-instance-delete-during-provision - rerun_command: /test e2e-metal-vmaas-compute-instance-delete-during-provision - run_if_changed: ^(base/|overlays/|scripts/|prerequisites/) - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-metal-vmaas-compute-instance-delete-during-provision - command: - - ci-operator - env: - - name: HTTP_SERVER_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - ports: - - containerPort: 8080 - name: http - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-metal-vmaas-compute-instance-delete-during-provision,?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^main$ - - ^main- - cluster: build11 - context: ci/prow/e2e-metal-vmaas-compute-instance-restart - decorate: true - decoration_config: - skip_cloning: true - labels: - capability/intranet: intranet - ci-operator.openshift.io/cloud: packet-edge - ci-operator.openshift.io/cloud-cluster-profile: packet-assisted - ci.openshift.io/generator: prowgen - job-release: "4.20" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-osac-project-osac-installer-main-e2e-metal-vmaas-compute-instance-restart - rerun_command: /test e2e-metal-vmaas-compute-instance-restart - run_if_changed: ^(base/|overlays/|scripts/|prerequisites/) - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-metal-vmaas-compute-instance-restart - command: - - ci-operator - env: - - name: HTTP_SERVER_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - ports: - - containerPort: 8080 - name: http - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-metal-vmaas-compute-instance-restart,?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^main$ - - ^main- - cluster: build11 - context: ci/prow/e2e-metal-vmaas-compute-instance-restart-negative - decorate: true - decoration_config: - skip_cloning: true - labels: - capability/intranet: intranet - ci-operator.openshift.io/cloud: packet-edge - ci-operator.openshift.io/cloud-cluster-profile: packet-assisted - ci.openshift.io/generator: prowgen - job-release: "4.20" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-osac-project-osac-installer-main-e2e-metal-vmaas-compute-instance-restart-negative - rerun_command: /test e2e-metal-vmaas-compute-instance-restart-negative - run_if_changed: ^(base/|overlays/|scripts/|prerequisites/) - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-metal-vmaas-compute-instance-restart-negative - command: - - ci-operator - env: - - name: HTTP_SERVER_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - ports: - - containerPort: 8080 - name: http - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-metal-vmaas-compute-instance-restart-negative,?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^main$ - - ^main- - cluster: build11 - context: ci/prow/e2e-metal-vmaas-subnet-lifecycle - decorate: true - decoration_config: - skip_cloning: true - labels: - capability/intranet: intranet - ci-operator.openshift.io/cloud: packet-edge - ci-operator.openshift.io/cloud-cluster-profile: packet-assisted - ci.openshift.io/generator: prowgen - job-release: "4.20" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-osac-project-osac-installer-main-e2e-metal-vmaas-subnet-lifecycle - rerun_command: /test e2e-metal-vmaas-subnet-lifecycle - run_if_changed: ^(base/|overlays/|scripts/|prerequisites/) - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-metal-vmaas-subnet-lifecycle - command: - - ci-operator - env: - - name: HTTP_SERVER_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - ports: - - containerPort: 8080 - name: http - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-metal-vmaas-subnet-lifecycle,?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^main$ - - ^main- - cluster: build11 - context: ci/prow/e2e-metal-vmaas-virtual-network-lifecycle - decorate: true - decoration_config: - skip_cloning: true - labels: - capability/intranet: intranet - ci-operator.openshift.io/cloud: packet-edge - ci-operator.openshift.io/cloud-cluster-profile: packet-assisted - ci.openshift.io/generator: prowgen - job-release: "4.20" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-osac-project-osac-installer-main-e2e-metal-vmaas-virtual-network-lifecycle - rerun_command: /test e2e-metal-vmaas-virtual-network-lifecycle - run_if_changed: ^(base/|overlays/|scripts/|prerequisites/) - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-metal-vmaas-virtual-network-lifecycle - command: - - ci-operator - env: - - name: HTTP_SERVER_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - ports: - - containerPort: 8080 - name: http - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-metal-vmaas-virtual-network-lifecycle,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-metal-vmaas-all,?($|\s.*) - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/osac-project/osac-operator/osac-project-osac-operator-main-presubmits.yaml b/ci-operator/jobs/osac-project/osac-operator/osac-project-osac-operator-main-presubmits.yaml index a033acd86874b..006a787109aaf 100644 --- a/ci-operator/jobs/osac-project/osac-operator/osac-project-osac-operator-main-presubmits.yaml +++ b/ci-operator/jobs/osac-project/osac-operator/osac-project-osac-operator-main-presubmits.yaml @@ -6,19 +6,17 @@ presubmits: - ^main$ - ^main- cluster: build10 - context: ci/prow/e2e-metal-vmaas-compute-instance-api-fields + context: ci/prow/e2e-metal-vmaas-all decorate: true decoration_config: skip_cloning: true labels: capability/intranet: intranet - ci-operator.openshift.io/cloud: packet-edge - ci-operator.openshift.io/cloud-cluster-profile: packet-assisted ci.openshift.io/generator: prowgen job-release: "4.20" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-osac-project-osac-operator-main-e2e-metal-vmaas-compute-instance-api-fields - rerun_command: /test e2e-metal-vmaas-compute-instance-api-fields + name: pull-ci-osac-project-osac-operator-main-e2e-metal-vmaas-all + rerun_command: /test e2e-metal-vmaas-all spec: containers: - args: @@ -27,7 +25,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-metal-vmaas-compute-instance-api-fields + - --target=e2e-metal-vmaas-all command: - ci-operator env: @@ -83,595 +81,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-metal-vmaas-compute-instance-api-fields,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^main$ - - ^main- - cluster: build10 - context: ci/prow/e2e-metal-vmaas-compute-instance-cli-fields - decorate: true - decoration_config: - skip_cloning: true - labels: - capability/intranet: intranet - ci-operator.openshift.io/cloud: packet-edge - ci-operator.openshift.io/cloud-cluster-profile: packet-assisted - ci.openshift.io/generator: prowgen - job-release: "4.20" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-osac-project-osac-operator-main-e2e-metal-vmaas-compute-instance-cli-fields - rerun_command: /test e2e-metal-vmaas-compute-instance-cli-fields - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-metal-vmaas-compute-instance-cli-fields - command: - - ci-operator - env: - - name: HTTP_SERVER_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - ports: - - containerPort: 8080 - name: http - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-metal-vmaas-compute-instance-cli-fields,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^main$ - - ^main- - cluster: build10 - context: ci/prow/e2e-metal-vmaas-compute-instance-creation - decorate: true - decoration_config: - skip_cloning: true - labels: - capability/intranet: intranet - ci-operator.openshift.io/cloud: packet-edge - ci-operator.openshift.io/cloud-cluster-profile: packet-assisted - ci.openshift.io/generator: prowgen - job-release: "4.20" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-osac-project-osac-operator-main-e2e-metal-vmaas-compute-instance-creation - rerun_command: /test e2e-metal-vmaas-compute-instance-creation - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-metal-vmaas-compute-instance-creation - command: - - ci-operator - env: - - name: HTTP_SERVER_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - ports: - - containerPort: 8080 - name: http - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-metal-vmaas-compute-instance-creation,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^main$ - - ^main- - cluster: build10 - context: ci/prow/e2e-metal-vmaas-compute-instance-delete-during-provision - decorate: true - decoration_config: - skip_cloning: true - labels: - capability/intranet: intranet - ci-operator.openshift.io/cloud: packet-edge - ci-operator.openshift.io/cloud-cluster-profile: packet-assisted - ci.openshift.io/generator: prowgen - job-release: "4.20" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-osac-project-osac-operator-main-e2e-metal-vmaas-compute-instance-delete-during-provision - rerun_command: /test e2e-metal-vmaas-compute-instance-delete-during-provision - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-metal-vmaas-compute-instance-delete-during-provision - command: - - ci-operator - env: - - name: HTTP_SERVER_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - ports: - - containerPort: 8080 - name: http - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-metal-vmaas-compute-instance-delete-during-provision,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^main$ - - ^main- - cluster: build10 - context: ci/prow/e2e-metal-vmaas-compute-instance-restart - decorate: true - decoration_config: - skip_cloning: true - labels: - capability/intranet: intranet - ci-operator.openshift.io/cloud: packet-edge - ci-operator.openshift.io/cloud-cluster-profile: packet-assisted - ci.openshift.io/generator: prowgen - job-release: "4.20" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-osac-project-osac-operator-main-e2e-metal-vmaas-compute-instance-restart - rerun_command: /test e2e-metal-vmaas-compute-instance-restart - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-metal-vmaas-compute-instance-restart - command: - - ci-operator - env: - - name: HTTP_SERVER_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - ports: - - containerPort: 8080 - name: http - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-metal-vmaas-compute-instance-restart,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^main$ - - ^main- - cluster: build10 - context: ci/prow/e2e-metal-vmaas-compute-instance-restart-negative - decorate: true - decoration_config: - skip_cloning: true - labels: - capability/intranet: intranet - ci-operator.openshift.io/cloud: packet-edge - ci-operator.openshift.io/cloud-cluster-profile: packet-assisted - ci.openshift.io/generator: prowgen - job-release: "4.20" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-osac-project-osac-operator-main-e2e-metal-vmaas-compute-instance-restart-negative - rerun_command: /test e2e-metal-vmaas-compute-instance-restart-negative - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-metal-vmaas-compute-instance-restart-negative - command: - - ci-operator - env: - - name: HTTP_SERVER_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - ports: - - containerPort: 8080 - name: http - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-metal-vmaas-compute-instance-restart-negative,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^main$ - - ^main- - cluster: build10 - context: ci/prow/e2e-metal-vmaas-subnet-lifecycle - decorate: true - decoration_config: - skip_cloning: true - labels: - capability/intranet: intranet - ci-operator.openshift.io/cloud: packet-edge - ci-operator.openshift.io/cloud-cluster-profile: packet-assisted - ci.openshift.io/generator: prowgen - job-release: "4.20" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-osac-project-osac-operator-main-e2e-metal-vmaas-subnet-lifecycle - rerun_command: /test e2e-metal-vmaas-subnet-lifecycle - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-metal-vmaas-subnet-lifecycle - command: - - ci-operator - env: - - name: HTTP_SERVER_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - ports: - - containerPort: 8080 - name: http - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-metal-vmaas-subnet-lifecycle,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^main$ - - ^main- - cluster: build10 - context: ci/prow/e2e-metal-vmaas-virtual-network-lifecycle - decorate: true - decoration_config: - skip_cloning: true - labels: - capability/intranet: intranet - ci-operator.openshift.io/cloud: packet-edge - ci-operator.openshift.io/cloud-cluster-profile: packet-assisted - ci.openshift.io/generator: prowgen - job-release: "4.20" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-osac-project-osac-operator-main-e2e-metal-vmaas-virtual-network-lifecycle - rerun_command: /test e2e-metal-vmaas-virtual-network-lifecycle - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-metal-vmaas-virtual-network-lifecycle - command: - - ci-operator - env: - - name: HTTP_SERVER_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - ports: - - containerPort: 8080 - name: http - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-metal-vmaas-virtual-network-lifecycle,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-metal-vmaas-all,?($|\s.*) - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/osac-project/osac-test-infra/osac-project-osac-test-infra-main-periodics.yaml b/ci-operator/jobs/osac-project/osac-test-infra/osac-project-osac-test-infra-main-periodics.yaml index 4bb7e277067c5..9b2bb68331a72 100644 --- a/ci-operator/jobs/osac-project/osac-test-infra/osac-project-osac-test-infra-main-periodics.yaml +++ b/ci-operator/jobs/osac-project/osac-test-infra/osac-project-osac-test-infra-main-periodics.yaml @@ -1,168 +1,4 @@ periodics: -- agent: kubernetes - cluster: build11 - cron: 0 6 * * 1 - decorate: true - decoration_config: - skip_cloning: true - extra_refs: - - base_ref: main - org: osac-project - repo: osac-test-infra - labels: - capability/intranet: intranet - ci-operator.openshift.io/cloud: packet-edge - ci-operator.openshift.io/cloud-cluster-profile: packet-assisted - ci.openshift.io/generator: prowgen - job-release: "4.20" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-osac-project-osac-test-infra-main-e2e-metal-vmaas-compute-instance-api-fields - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-metal-vmaas-compute-instance-api-fields - command: - - ci-operator - env: - - name: HTTP_SERVER_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - ports: - - containerPort: 8080 - name: http - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator -- agent: kubernetes - cluster: build11 - cron: 0 2 * * 2 - decorate: true - decoration_config: - skip_cloning: true - extra_refs: - - base_ref: main - org: osac-project - repo: osac-test-infra - labels: - capability/intranet: intranet - ci-operator.openshift.io/cloud: packet-edge - ci-operator.openshift.io/cloud-cluster-profile: packet-assisted - ci.openshift.io/generator: prowgen - job-release: "4.20" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-osac-project-osac-test-infra-main-e2e-metal-vmaas-compute-instance-cli-fields - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-metal-vmaas-compute-instance-cli-fields - command: - - ci-operator - env: - - name: HTTP_SERVER_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - ports: - - containerPort: 8080 - name: http - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - agent: kubernetes cluster: build11 cron: 0 2 * * 1 @@ -175,422 +11,10 @@ periodics: repo: osac-test-infra labels: capability/intranet: intranet - ci-operator.openshift.io/cloud: packet-edge - ci-operator.openshift.io/cloud-cluster-profile: packet-assisted - ci.openshift.io/generator: prowgen - job-release: "4.20" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-osac-project-osac-test-infra-main-e2e-metal-vmaas-compute-instance-creation - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-metal-vmaas-compute-instance-creation - command: - - ci-operator - env: - - name: HTTP_SERVER_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - ports: - - containerPort: 8080 - name: http - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator -- agent: kubernetes - cluster: build11 - cron: 0 6 * * 2 - decorate: true - decoration_config: - skip_cloning: true - extra_refs: - - base_ref: main - org: osac-project - repo: osac-test-infra - labels: - capability/intranet: intranet - ci-operator.openshift.io/cloud: packet-edge - ci-operator.openshift.io/cloud-cluster-profile: packet-assisted - ci.openshift.io/generator: prowgen - job-release: "4.20" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-osac-project-osac-test-infra-main-e2e-metal-vmaas-compute-instance-delete-during-provision - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-metal-vmaas-compute-instance-delete-during-provision - command: - - ci-operator - env: - - name: HTTP_SERVER_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - ports: - - containerPort: 8080 - name: http - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator -- agent: kubernetes - cluster: build11 - cron: 0 2 * * 3 - decorate: true - decoration_config: - skip_cloning: true - extra_refs: - - base_ref: main - org: osac-project - repo: osac-test-infra - labels: - capability/intranet: intranet - ci-operator.openshift.io/cloud: packet-edge - ci-operator.openshift.io/cloud-cluster-profile: packet-assisted - ci.openshift.io/generator: prowgen - job-release: "4.20" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-osac-project-osac-test-infra-main-e2e-metal-vmaas-compute-instance-restart - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-metal-vmaas-compute-instance-restart - command: - - ci-operator - env: - - name: HTTP_SERVER_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - ports: - - containerPort: 8080 - name: http - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator -- agent: kubernetes - cluster: build11 - cron: 0 6 * * 3 - decorate: true - decoration_config: - skip_cloning: true - extra_refs: - - base_ref: main - org: osac-project - repo: osac-test-infra - labels: - capability/intranet: intranet - ci-operator.openshift.io/cloud: packet-edge - ci-operator.openshift.io/cloud-cluster-profile: packet-assisted - ci.openshift.io/generator: prowgen - job-release: "4.20" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-osac-project-osac-test-infra-main-e2e-metal-vmaas-compute-instance-restart-negative - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-metal-vmaas-compute-instance-restart-negative - command: - - ci-operator - env: - - name: HTTP_SERVER_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - ports: - - containerPort: 8080 - name: http - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator -- agent: kubernetes - cluster: build11 - cron: 0 2 * * 4 - decorate: true - decoration_config: - skip_cloning: true - extra_refs: - - base_ref: main - org: osac-project - repo: osac-test-infra - labels: - capability/intranet: intranet - ci-operator.openshift.io/cloud: packet-edge - ci-operator.openshift.io/cloud-cluster-profile: packet-assisted - ci.openshift.io/generator: prowgen - job-release: "4.20" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-osac-project-osac-test-infra-main-e2e-metal-vmaas-subnet-lifecycle - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-metal-vmaas-subnet-lifecycle - command: - - ci-operator - env: - - name: HTTP_SERVER_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - ports: - - containerPort: 8080 - name: http - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator -- agent: kubernetes - cluster: build11 - cron: 0 6 * * 4 - decorate: true - decoration_config: - skip_cloning: true - extra_refs: - - base_ref: main - org: osac-project - repo: osac-test-infra - labels: - capability/intranet: intranet - ci-operator.openshift.io/cloud: packet-edge - ci-operator.openshift.io/cloud-cluster-profile: packet-assisted ci.openshift.io/generator: prowgen job-release: "4.20" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-osac-project-osac-test-infra-main-e2e-metal-vmaas-virtual-network-lifecycle + name: periodic-ci-osac-project-osac-test-infra-main-e2e-metal-vmaas-all-periodic spec: containers: - args: @@ -599,7 +23,7 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-metal-vmaas-virtual-network-lifecycle + - --target=e2e-metal-vmaas-all-periodic command: - ci-operator env: diff --git a/ci-operator/jobs/osac-project/osac-test-infra/osac-project-osac-test-infra-main-presubmits.yaml b/ci-operator/jobs/osac-project/osac-test-infra/osac-project-osac-test-infra-main-presubmits.yaml index 8bb61a6e0a5b4..078f3e5da4928 100644 --- a/ci-operator/jobs/osac-project/osac-test-infra/osac-project-osac-test-infra-main-presubmits.yaml +++ b/ci-operator/jobs/osac-project/osac-test-infra/osac-project-osac-test-infra-main-presubmits.yaml @@ -6,19 +6,17 @@ presubmits: - ^main$ - ^main- cluster: build03 - context: ci/prow/e2e-metal-vmaas-compute-instance-api-fields-pr + context: ci/prow/e2e-metal-vmaas-all decorate: true decoration_config: skip_cloning: true labels: capability/intranet: intranet - ci-operator.openshift.io/cloud: packet-edge - ci-operator.openshift.io/cloud-cluster-profile: packet-assisted ci.openshift.io/generator: prowgen job-release: "4.20" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-osac-project-osac-test-infra-main-e2e-metal-vmaas-compute-instance-api-fields-pr - rerun_command: /test e2e-metal-vmaas-compute-instance-api-fields-pr + name: pull-ci-osac-project-osac-test-infra-main-e2e-metal-vmaas-all + rerun_command: /test e2e-metal-vmaas-all spec: containers: - args: @@ -27,7 +25,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-metal-vmaas-compute-instance-api-fields-pr + - --target=e2e-metal-vmaas-all command: - ci-operator env: @@ -83,595 +81,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-metal-vmaas-compute-instance-api-fields-pr,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^main$ - - ^main- - cluster: build03 - context: ci/prow/e2e-metal-vmaas-compute-instance-cli-fields-pr - decorate: true - decoration_config: - skip_cloning: true - labels: - capability/intranet: intranet - ci-operator.openshift.io/cloud: packet-edge - ci-operator.openshift.io/cloud-cluster-profile: packet-assisted - ci.openshift.io/generator: prowgen - job-release: "4.20" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-osac-project-osac-test-infra-main-e2e-metal-vmaas-compute-instance-cli-fields-pr - rerun_command: /test e2e-metal-vmaas-compute-instance-cli-fields-pr - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-metal-vmaas-compute-instance-cli-fields-pr - command: - - ci-operator - env: - - name: HTTP_SERVER_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - ports: - - containerPort: 8080 - name: http - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-metal-vmaas-compute-instance-cli-fields-pr,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^main$ - - ^main- - cluster: build03 - context: ci/prow/e2e-metal-vmaas-compute-instance-creation-pr - decorate: true - decoration_config: - skip_cloning: true - labels: - capability/intranet: intranet - ci-operator.openshift.io/cloud: packet-edge - ci-operator.openshift.io/cloud-cluster-profile: packet-assisted - ci.openshift.io/generator: prowgen - job-release: "4.20" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-osac-project-osac-test-infra-main-e2e-metal-vmaas-compute-instance-creation-pr - rerun_command: /test e2e-metal-vmaas-compute-instance-creation-pr - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-metal-vmaas-compute-instance-creation-pr - command: - - ci-operator - env: - - name: HTTP_SERVER_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - ports: - - containerPort: 8080 - name: http - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-metal-vmaas-compute-instance-creation-pr,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^main$ - - ^main- - cluster: build03 - context: ci/prow/e2e-metal-vmaas-compute-instance-del-during-prov-pr - decorate: true - decoration_config: - skip_cloning: true - labels: - capability/intranet: intranet - ci-operator.openshift.io/cloud: packet-edge - ci-operator.openshift.io/cloud-cluster-profile: packet-assisted - ci.openshift.io/generator: prowgen - job-release: "4.20" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-osac-project-osac-test-infra-main-e2e-metal-vmaas-compute-instance-del-during-prov-pr - rerun_command: /test e2e-metal-vmaas-compute-instance-del-during-prov-pr - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-metal-vmaas-compute-instance-del-during-prov-pr - command: - - ci-operator - env: - - name: HTTP_SERVER_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - ports: - - containerPort: 8080 - name: http - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-metal-vmaas-compute-instance-del-during-prov-pr,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^main$ - - ^main- - cluster: build03 - context: ci/prow/e2e-metal-vmaas-compute-instance-restart-neg-pr - decorate: true - decoration_config: - skip_cloning: true - labels: - capability/intranet: intranet - ci-operator.openshift.io/cloud: packet-edge - ci-operator.openshift.io/cloud-cluster-profile: packet-assisted - ci.openshift.io/generator: prowgen - job-release: "4.20" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-osac-project-osac-test-infra-main-e2e-metal-vmaas-compute-instance-restart-neg-pr - rerun_command: /test e2e-metal-vmaas-compute-instance-restart-neg-pr - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-metal-vmaas-compute-instance-restart-neg-pr - command: - - ci-operator - env: - - name: HTTP_SERVER_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - ports: - - containerPort: 8080 - name: http - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-metal-vmaas-compute-instance-restart-neg-pr,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^main$ - - ^main- - cluster: build03 - context: ci/prow/e2e-metal-vmaas-compute-instance-restart-pr - decorate: true - decoration_config: - skip_cloning: true - labels: - capability/intranet: intranet - ci-operator.openshift.io/cloud: packet-edge - ci-operator.openshift.io/cloud-cluster-profile: packet-assisted - ci.openshift.io/generator: prowgen - job-release: "4.20" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-osac-project-osac-test-infra-main-e2e-metal-vmaas-compute-instance-restart-pr - rerun_command: /test e2e-metal-vmaas-compute-instance-restart-pr - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-metal-vmaas-compute-instance-restart-pr - command: - - ci-operator - env: - - name: HTTP_SERVER_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - ports: - - containerPort: 8080 - name: http - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-metal-vmaas-compute-instance-restart-pr,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^main$ - - ^main- - cluster: build03 - context: ci/prow/e2e-metal-vmaas-subnet-lifecycle-pr - decorate: true - decoration_config: - skip_cloning: true - labels: - capability/intranet: intranet - ci-operator.openshift.io/cloud: packet-edge - ci-operator.openshift.io/cloud-cluster-profile: packet-assisted - ci.openshift.io/generator: prowgen - job-release: "4.20" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-osac-project-osac-test-infra-main-e2e-metal-vmaas-subnet-lifecycle-pr - rerun_command: /test e2e-metal-vmaas-subnet-lifecycle-pr - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-metal-vmaas-subnet-lifecycle-pr - command: - - ci-operator - env: - - name: HTTP_SERVER_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - ports: - - containerPort: 8080 - name: http - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-metal-vmaas-subnet-lifecycle-pr,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^main$ - - ^main- - cluster: build03 - context: ci/prow/e2e-metal-vmaas-virtual-network-lifecycle-pr - decorate: true - decoration_config: - skip_cloning: true - labels: - capability/intranet: intranet - ci-operator.openshift.io/cloud: packet-edge - ci-operator.openshift.io/cloud-cluster-profile: packet-assisted - ci.openshift.io/generator: prowgen - job-release: "4.20" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-osac-project-osac-test-infra-main-e2e-metal-vmaas-virtual-network-lifecycle-pr - rerun_command: /test e2e-metal-vmaas-virtual-network-lifecycle-pr - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-metal-vmaas-virtual-network-lifecycle-pr - command: - - ci-operator - env: - - name: HTTP_SERVER_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - ports: - - containerPort: 8080 - name: http - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-metal-vmaas-virtual-network-lifecycle-pr,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-metal-vmaas-all,?($|\s.*) - agent: kubernetes always_run: true branches: diff --git a/ci-operator/step-registry/osac-project/baremetal/test/osac-project-baremetal-test-commands.sh b/ci-operator/step-registry/osac-project/baremetal/test/osac-project-baremetal-test-commands.sh deleted file mode 100644 index 1157917703246..0000000000000 --- a/ci-operator/step-registry/osac-project/baremetal/test/osac-project-baremetal-test-commands.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -set -o nounset -set -o errexit -set -o pipefail - -echo "Running OSAC E2E test: ${TEST}" - -timeout -s 9 60m ssh -F "${SHARED_DIR}/ssh_config" ci_machine bash -s "${TEST}" "${E2E_NAMESPACE}" "${E2E_VM_TEMPLATE}" "${E2E_CLUSTER_TEMPLATE}" "${OSAC_TEST_IMAGE}" <<'REMOTE_EOF' -set -euo pipefail - -TEST="$1" -E2E_NAMESPACE="$2" -E2E_VM_TEMPLATE="$3" -E2E_CLUSTER_TEMPLATE="$4" -OSAC_TEST_IMAGE="$5" - -KUBECONFIG=$(find ${KUBECONFIG} -type f -print -quit 2>/dev/null) -[[ -z "${KUBECONFIG}" ]] && echo "ERROR: No kubeconfig found" && exit 1 - -PULL_SECRET_PATH="/root/pull-secret" - -set +x -podman run --authfile "${PULL_SECRET_PATH}" --rm --network=host \ - -v "${KUBECONFIG}:/root/.kube/config:z" \ - -v "${PULL_SECRET_PATH}:/root/pull-secret:z" \ - -e KUBECONFIG=/root/.kube/config \ - -e OSAC_VM_KUBECONFIG=/root/.kube/config \ - -e OSAC_NAMESPACE="${E2E_NAMESPACE}" \ - -e OSAC_VM_TEMPLATE="${E2E_VM_TEMPLATE}" \ - -e OSAC_CLUSTER_TEMPLATE="${E2E_CLUSTER_TEMPLATE}" \ - -e OSAC_PULL_SECRET_PATH=/root/pull-secret \ - "${OSAC_TEST_IMAGE}" \ - make test TEST="${TEST}" -REMOTE_EOF - -echo "Test completed" diff --git a/ci-operator/step-registry/osac-project/baremetal/OWNERS b/ci-operator/step-registry/osac-project/cluster-tool/OWNERS similarity index 100% rename from ci-operator/step-registry/osac-project/baremetal/OWNERS rename to ci-operator/step-registry/osac-project/cluster-tool/OWNERS diff --git a/ci-operator/step-registry/osac-project/baremetal/test/OWNERS b/ci-operator/step-registry/osac-project/cluster-tool/boot/OWNERS similarity index 100% rename from ci-operator/step-registry/osac-project/baremetal/test/OWNERS rename to ci-operator/step-registry/osac-project/cluster-tool/boot/OWNERS diff --git a/ci-operator/step-registry/osac-project/cluster-tool/boot/osac-project-cluster-tool-boot-commands.sh b/ci-operator/step-registry/osac-project/cluster-tool/boot/osac-project-cluster-tool-boot-commands.sh new file mode 100644 index 0000000000000..3906a1ccb7a04 --- /dev/null +++ b/ci-operator/step-registry/osac-project/cluster-tool/boot/osac-project-cluster-tool-boot-commands.sh @@ -0,0 +1,332 @@ +#!/bin/bash + +set -o nounset +set -o errexit +set -o pipefail + +echo "************ cluster-tool boot ************" +echo "CLUSTER_TOOL_COMMIT: ${CLUSTER_TOOL_COMMIT}" +echo "CLUSTER_TOOL_FLAVOR_IMAGE: ${CLUSTER_TOOL_FLAVOR_IMAGE}" +echo "E2E_NAMESPACE: ${E2E_NAMESPACE}" +echo "E2E_KUSTOMIZE_OVERLAY: ${E2E_KUSTOMIZE_OVERLAY}" +echo "E2E_VM_TEMPLATE: ${E2E_VM_TEMPLATE}" +echo "OSAC_INSTALLER_IMAGE: ${OSAC_INSTALLER_IMAGE}" +echo "COMPONENT_IMAGE: ${COMPONENT_IMAGE:-}" +echo "COMPONENT_IMAGE_NAME: ${COMPONENT_IMAGE_NAME:-}" +echo "-------------------------------------------" + +CLONE_NAME="ci-test" + +# === Create ssh_config from ofcir-acquire output === +IP=$(cat "${SHARED_DIR}/server-ip") +PORT=22 +if [[ -f "${SHARED_DIR}/server-sshport" ]]; then + PORT=$(<"${SHARED_DIR}/server-sshport") +fi + +cat > "${SHARED_DIR}/ssh_config" </dev/null && break + echo " attempt ${i}/30 - retrying in 10s..." + sleep 10 +done + +# === Build merged pull-secret with CI registry credentials === +# The CI build-farm registry (registry.buildXX.ci.openshift.org) requires auth +# from the pod's service account token. The old workflow got this via dev-scripts +# setup; cluster-tool skips that, so we inject the creds from the SA token directly. +echo "Building pull secret..." +echo " Cluster profile registries: $(jq -r '.auths | keys | join(", ")' ${CLUSTER_PROFILE_DIR}/pull-secret 2>/dev/null || echo 'PARSE ERROR')" + +CI_REGISTRY=$(echo "${OSAC_INSTALLER_IMAGE}" | cut -d/ -f1) +SA_TOKEN=$(cat /var/run/secrets/kubernetes.io/serviceaccount/token) +CI_AUTH=$(echo -n "serviceaccount:${SA_TOKEN}" | base64 -w0) +echo "{\"auths\":{\"${CI_REGISTRY}\":{\"auth\":\"${CI_AUTH}\"}}}" > /tmp/ci-pull-creds.json +echo " CI registry: ${CI_REGISTRY}" + +jq -s 'reduce .[] as $x ({}; . * $x)' \ + "${CLUSTER_PROFILE_DIR}/pull-secret" \ + /tmp/ci-pull-creds.json \ + > /tmp/merged-pull-secret.json +echo " Merged registries: $(jq -r '.auths | keys | join(", ")' /tmp/merged-pull-secret.json 2>/dev/null || echo 'PARSE ERROR')" + +echo "Copying pull secret to machine..." +timeout -s 9 2m scp -F "${SHARED_DIR}/ssh_config" \ + /tmp/merged-pull-secret.json \ + ci_machine:/root/pull-secret + +echo "Copying AAP license to machine..." +base64 -d /var/run/osac-installer-aap/license > /tmp/license.zip +timeout -s 9 2m scp -F "${SHARED_DIR}/ssh_config" \ + /tmp/license.zip \ + ci_machine:/tmp/license.zip + +# === Create refresh script on machine (PR #95 not yet merged) === +echo "Creating refresh script on machine..." +timeout -s 9 1m ssh -F "${SHARED_DIR}/ssh_config" ci_machine bash -c 'cat > /root/refresh-after-snapshot.sh' <<'REFRESH_SCRIPT' +#!/bin/bash + +set -o nounset +set -o errexit +set -o pipefail + +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +source "${SCRIPT_DIR}/lib.sh" + +INSTALLER_KUSTOMIZE_OVERLAY=${INSTALLER_KUSTOMIZE_OVERLAY:-"development"} +INSTALLER_NAMESPACE=${INSTALLER_NAMESPACE:-$(grep "^namespace:" "overlays/${INSTALLER_KUSTOMIZE_OVERLAY}/kustomization.yaml" | awk '{print $2}')} +[[ -z "${INSTALLER_NAMESPACE}" ]] && echo "ERROR: Could not determine namespace from overlays/${INSTALLER_KUSTOMIZE_OVERLAY}/kustomization.yaml" && exit 1 +INSTALLER_VM_TEMPLATE=${INSTALLER_VM_TEMPLATE:-} + +CLUSTER_DOMAIN=$(oc get ingresses.config/cluster -o jsonpath='{.spec.domain}') +echo "=== Refreshing OSAC after snapshot boot ===" +echo "Namespace: ${INSTALLER_NAMESPACE}" +echo "Overlay: ${INSTALLER_KUSTOMIZE_OVERLAY}" +echo "Cluster domain: ${CLUSTER_DOMAIN}" +echo "" + +echo "[1/8] Patching stale routes with new domain..." +OLD_DOMAIN=$(oc get route osac-aap -n "${INSTALLER_NAMESPACE}" -o jsonpath='{.spec.host}' 2>/dev/null | sed "s/^osac-aap-${INSTALLER_NAMESPACE}\.//") +echo " Old domain: ${OLD_DOMAIN}" +echo " New domain: ${CLUSTER_DOMAIN}" +for route in $(oc get routes -n "${INSTALLER_NAMESPACE}" -o jsonpath='{.items[*].metadata.name}'); do + OLD_HOST=$(oc get route "${route}" -n "${INSTALLER_NAMESPACE}" -o jsonpath='{.spec.host}') + NEW_HOST=$(echo "${OLD_HOST}" | sed "s/${OLD_DOMAIN}/${CLUSTER_DOMAIN}/") + oc patch route "${route}" -n "${INSTALLER_NAMESPACE}" --type=merge -p "{\"spec\":{\"host\":\"${NEW_HOST}\"}}" +done + +echo "[2/8] Applying kustomize overlay..." +oc delete job -n "${INSTALLER_NAMESPACE}" --all --ignore-not-found +oc apply -k "overlays/${INSTALLER_KUSTOMIZE_OVERLAY}" + +echo "[3/8] Applying AAP configuration..." +INSTALLER_NAMESPACE="${INSTALLER_NAMESPACE}" \ +INSTALLER_KUSTOMIZE_OVERLAY="${INSTALLER_KUSTOMIZE_OVERLAY}" \ + ./scripts/aap-configuration.sh + +oc config set-context --current --namespace="${INSTALLER_NAMESPACE}" + +echo "[4/8] Waiting for AAP controller..." +retry_until 300 10 '[[ "$(oc get automationcontroller osac-aap-controller -n '"${INSTALLER_NAMESPACE}"' -o jsonpath='"'"'{.status.conditions[?(@.type=="Running")].status}'"'"' 2>/dev/null)" == "True" ]]' || { + echo "Timed out waiting for AAP controller to be Running" + exit 1 +} +AAP_ROUTE_HOST=$(oc get route osac-aap -n "${INSTALLER_NAMESPACE}" -o jsonpath='{.spec.host}') +retry_until 120 5 '[[ "$(curl -sk -o /dev/null -w %{http_code} https://'"${AAP_ROUTE_HOST}"'/api/gateway/v1/)" == "200" ]]' || { + echo "Timed out waiting for AAP gateway API to respond" + exit 1 +} + +echo "[5/8] Configuring AAP access..." +./scripts/prepare-aap.sh + +echo "[6/8] Configuring fulfillment service..." +./scripts/prepare-fulfillment-service.sh + +echo "[7/8] Restarting fulfillment pods..." +oc rollout restart deploy/fulfillment-controller -n "${INSTALLER_NAMESPACE}" +oc rollout restart deploy/fulfillment-grpc-server -n "${INSTALLER_NAMESPACE}" +oc rollout restart deploy/fulfillment-rest-gateway -n "${INSTALLER_NAMESPACE}" +oc rollout restart deploy/fulfillment-ingress-proxy -n "${INSTALLER_NAMESPACE}" +oc rollout status deploy/fulfillment-controller -n "${INSTALLER_NAMESPACE}" --timeout=120s +oc rollout status deploy/fulfillment-grpc-server -n "${INSTALLER_NAMESPACE}" --timeout=120s +oc rollout status deploy/fulfillment-rest-gateway -n "${INSTALLER_NAMESPACE}" --timeout=120s +oc rollout status deploy/fulfillment-ingress-proxy -n "${INSTALLER_NAMESPACE}" --timeout=120s + +echo "[8/8] Configuring tenant..." +./scripts/prepare-tenant.sh + +echo "" +echo "=== Refresh complete ===" +echo "Cluster domain: ${CLUSTER_DOMAIN}" +echo "Namespace: ${INSTALLER_NAMESPACE}" +REFRESH_SCRIPT +ssh -F "${SHARED_DIR}/ssh_config" ci_machine chmod +x /root/refresh-after-snapshot.sh + +# === Create patched prepare-fulfillment-service.sh (PR #95 adds osac delete hub) === +echo "Creating patched prepare-fulfillment-service.sh on machine..." +timeout -s 9 1m ssh -F "${SHARED_DIR}/ssh_config" ci_machine bash -c 'cat > /root/prepare-fulfillment-service.sh' <<'PREPARE_FS_SCRIPT' +#!/bin/bash + +set -o nounset +set -o errexit +set -o pipefail + +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +source "${SCRIPT_DIR}/lib.sh" + +INSTALLER_KUSTOMIZE_OVERLAY=${INSTALLER_KUSTOMIZE_OVERLAY:-"development"} +INSTALLER_NAMESPACE=${INSTALLER_NAMESPACE:-$(grep "^namespace:" "overlays/${INSTALLER_KUSTOMIZE_OVERLAY}/kustomization.yaml" | awk '{print $2}')} +[[ -z "${INSTALLER_NAMESPACE}" ]] && echo "ERROR: Could not determine namespace from overlays/${INSTALLER_KUSTOMIZE_OVERLAY}/kustomization.yaml" && exit 1 +INSTALLER_VM_TEMPLATE=${INSTALLER_VM_TEMPLATE:-} + +./scripts/create-hub-access-kubeconfig.sh + +FULFILLMENT_INTERNAL_API_URL=https://$(oc get route -n ${INSTALLER_NAMESPACE} fulfillment-internal-api -o jsonpath='{.status.ingress[0].host}') +osac login --insecure --private --token-script "oc create token -n ${INSTALLER_NAMESPACE} admin" --address ${FULFILLMENT_INTERNAL_API_URL} +osac delete hub hub +osac create hub --kubeconfig=/tmp/kubeconfig.hub-access --id hub --namespace ${INSTALLER_NAMESPACE} + +if [[ -n "${INSTALLER_VM_TEMPLATE}" ]]; then + AAP_ROUTE_HOST=$(oc get routes -n "${INSTALLER_NAMESPACE}" --no-headers osac-aap -o jsonpath='{.spec.host}') + AAP_URL="https://${AAP_ROUTE_HOST}" + AAP_TOKEN=$(oc get secret osac-aap-api-token -n "${INSTALLER_NAMESPACE}" -o jsonpath='{.data.token}' | base64 -d) + echo "Waiting for AAP controller API to be ready..." + for attempt in $(seq 1 30); do + JT_ID=$(curl -kfsS -H "Authorization: Bearer ${AAP_TOKEN}" \ + "${AAP_URL}/api/controller/v2/job_templates/?name=osac-publish-templates" 2>/dev/null | jq -er '.results[0].id // empty' 2>/dev/null) && break + echo " attempt ${attempt}/30 - AAP controller API not ready, retrying in 10s..." + sleep 10 + done + [[ -z "${JT_ID:-}" ]] && { echo "Failed to find osac-publish-templates AAP job template after 30 attempts"; exit 1; } + echo "Launching publish-templates AAP job (template ID: ${JT_ID})..." + for attempt in $(seq 1 10); do + curl -kfsS -X POST -H "Authorization: Bearer ${AAP_TOKEN}" -H "Content-Type: application/json" \ + "${AAP_URL}/api/controller/v2/job_templates/${JT_ID}/launch/" >/dev/null 2>&1 && break + echo " launch attempt ${attempt}/10 - retrying in 10s..." + sleep 10 + done + + echo "Waiting for computeinstancetemplate ${INSTALLER_VM_TEMPLATE} to be published..." + retry_until 300 5 '[[ -n "$(osac get computeinstancetemplate -o json | jq -r --arg tpl "$INSTALLER_VM_TEMPLATE" '"'"'select(.id == $tpl)'"'"' 2> /dev/null)" ]]' || { + echo "Timed out waiting for computeinstancetemplate to exist" + exit 1 + } +fi +PREPARE_FS_SCRIPT +ssh -F "${SHARED_DIR}/ssh_config" ci_machine chmod +x /root/prepare-fulfillment-service.sh + +# === Write boot script to machine and execute === +echo "Creating boot script on machine..." +timeout -s 9 1m ssh -F "${SHARED_DIR}/ssh_config" ci_machine bash -c 'cat > /root/boot.sh' <<'REMOTE_SCRIPT' +set -euo pipefail + +COMMIT="$1" +FLAVOR_IMAGE="$2" +CLONE="$3" +INSTALLER_IMAGE="$4" +KUSTOMIZE_OVERLAY="$5" +VM_TEMPLATE="$6" +COMPONENT_IMAGE="${7:-}" +COMPONENT_IMAGE_NAME="${8:-}" +NAMESPACE="${9:-osac-e2e-ci}" + +# --- Phase 1: cluster-tool setup --- +echo "=== Downloading cluster-tool ===" +curl -sL "https://raw.githubusercontent.com/omer-vishlitzky/cluster-tool/${COMMIT}/cluster-tool" \ + -o /usr/local/bin/cluster-tool +chmod +x /usr/local/bin/cluster-tool + +echo "=== Setting up DNS (standalone dnsmasq) ===" +ORIG_DNS=$(grep nameserver /etc/resolv.conf 2>/dev/null | awk '{print $2}' | head -1) +ORIG_DNS=${ORIG_DNS:-8.8.8.8} + +dnf install -y dnsmasq jq +mkdir -p /etc/NetworkManager/dnsmasq.d /etc/dnsmasq.d /etc/NetworkManager/conf.d + +systemctl stop systemd-resolved 2>/dev/null || true +systemctl disable systemd-resolved 2>/dev/null || true + +echo -e '[main]\ndns=none' > /etc/NetworkManager/conf.d/cluster-tool-dns.conf +systemctl restart NetworkManager + +cat > /etc/dnsmasq.d/cluster-tool.conf < /etc/resolv.conf +echo "DNS ready (standalone dnsmasq, upstream=${ORIG_DNS})" + +echo "=== Setting up server ===" +python3 /usr/local/bin/cluster-tool connect ci --host local --data-path /home/cluster-tool + +# --- Phase 2: pull + boot --- +echo "=== Setting up container auth ===" +mkdir -p /root/.config/containers +cp /root/pull-secret /root/.config/containers/auth.json + +echo "=== Pulling OSAC vmaas flavor ===" +python3 /usr/local/bin/cluster-tool pull "${FLAVOR_IMAGE}" + +echo "=== Booting cluster ===" +python3 /usr/local/bin/cluster-tool boot --flavor osac-vmaas --name "${CLONE}" + +systemctl restart dnsmasq + +# --- Phase 3: configure access --- +KUBECONFIG_PATH="/root/.kube/${CLONE}.kubeconfig" +echo "export KUBECONFIG=${KUBECONFIG_PATH}" >> /root/.bashrc +export KUBECONFIG="${KUBECONFIG_PATH}" + +echo "=== Installing oc ===" +curl -sL https://mirror.openshift.com/pub/openshift-v4/clients/ocp/stable/openshift-client-linux.tar.gz \ + | tar xzf - -C /usr/local/bin oc kubectl + +echo "=== Installing osac from installer image ===" +podman run --authfile /root/pull-secret --rm \ + -v /usr/local/bin:/target:z \ + "${INSTALLER_IMAGE}" \ + cp /usr/local/bin/osac /target/osac + +echo "=== Updating cluster pull secret ===" +oc set data secret/pull-secret -n openshift-config \ + --from-file=.dockerconfigjson=/root/pull-secret + +# --- Phase 4: component override (conditional) --- +COMPONENT_OVERRIDE_CMD="" +if [[ -n "${COMPONENT_IMAGE}" ]] && [[ -n "${COMPONENT_IMAGE_NAME}" ]]; then + echo "=== Component override: ${COMPONENT_IMAGE_NAME} ===" + COMPONENT_OVERRIDE_CMD="curl -sL https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv5.6.0/kustomize_v5.6.0_linux_amd64.tar.gz | tar xzf - -C /usr/local/bin && cd /installer/base && kustomize edit set image ${COMPONENT_IMAGE_NAME}=${COMPONENT_IMAGE} && cd /installer && " +fi + +# --- Phase 5: refresh --- +echo "=== Running refresh ===" +podman run --authfile /root/pull-secret --rm --network=host \ + -v "${KUBECONFIG_PATH}":/root/.kube/config:z \ + -v /root/pull-secret:/installer/overlays/${KUSTOMIZE_OVERLAY}/files/quay-pull-secret.json:z \ + -v /tmp/license.zip:/installer/overlays/${KUSTOMIZE_OVERLAY}/files/license.zip:z \ + -v /root/refresh-after-snapshot.sh:/installer/scripts/refresh-after-snapshot.sh:z \ + -v /root/prepare-fulfillment-service.sh:/installer/scripts/prepare-fulfillment-service.sh:z \ + -e KUBECONFIG=/root/.kube/config \ + -e INSTALLER_KUSTOMIZE_OVERLAY="${KUSTOMIZE_OVERLAY}" \ + -e INSTALLER_VM_TEMPLATE="${VM_TEMPLATE}" \ + -e INSTALLER_NAMESPACE="${NAMESPACE}" \ + "${INSTALLER_IMAGE}" \ + bash -c "${COMPONENT_OVERRIDE_CMD}cd /installer && sh scripts/refresh-after-snapshot.sh" + +echo "=== Boot + refresh complete ===" +REMOTE_SCRIPT + +echo "Executing boot script on machine..." +timeout -s 9 50m ssh -F "${SHARED_DIR}/ssh_config" ci_machine \ + "bash /root/boot.sh \ + '${CLUSTER_TOOL_COMMIT}' \ + '${CLUSTER_TOOL_FLAVOR_IMAGE}' \ + '${CLONE_NAME}' \ + '${OSAC_INSTALLER_IMAGE}' \ + '${E2E_KUSTOMIZE_OVERLAY}' \ + '${E2E_VM_TEMPLATE}' \ + '${COMPONENT_IMAGE:-}' \ + '${COMPONENT_IMAGE_NAME:-}' \ + '${E2E_NAMESPACE}'" + +echo "Boot step finished successfully." diff --git a/ci-operator/step-registry/osac-project/baremetal/test/osac-project-baremetal-test-ref.metadata.json b/ci-operator/step-registry/osac-project/cluster-tool/boot/osac-project-cluster-tool-boot-ref.metadata.json similarity index 52% rename from ci-operator/step-registry/osac-project/baremetal/test/osac-project-baremetal-test-ref.metadata.json rename to ci-operator/step-registry/osac-project/cluster-tool/boot/osac-project-cluster-tool-boot-ref.metadata.json index 1546c8335856e..9d7bb3600ddf3 100644 --- a/ci-operator/step-registry/osac-project/baremetal/test/osac-project-baremetal-test-ref.metadata.json +++ b/ci-operator/step-registry/osac-project/cluster-tool/boot/osac-project-cluster-tool-boot-ref.metadata.json @@ -1,5 +1,5 @@ { - "path": "osac-project/baremetal/test/osac-project-baremetal-test-ref.yaml", + "path": "osac-project/cluster-tool/boot/osac-project-cluster-tool-boot-ref.yaml", "owners": { "approvers": [ "osac-cicd" diff --git a/ci-operator/step-registry/osac-project/cluster-tool/boot/osac-project-cluster-tool-boot-ref.yaml b/ci-operator/step-registry/osac-project/cluster-tool/boot/osac-project-cluster-tool-boot-ref.yaml new file mode 100644 index 0000000000000..b324094ec57cb --- /dev/null +++ b/ci-operator/step-registry/osac-project/cluster-tool/boot/osac-project-cluster-tool-boot-ref.yaml @@ -0,0 +1,42 @@ +ref: + as: osac-project-cluster-tool-boot + from: dev-scripts + dependencies: + - name: osac-installer + env: OSAC_INSTALLER_IMAGE + - name: component-image + env: COMPONENT_IMAGE + grace_period: 10m + timeout: 1h0m0s + commands: osac-project-cluster-tool-boot-commands.sh + resources: + requests: + cpu: 100m + memory: 200Mi + credentials: + - namespace: test-credentials + name: osac-installer-aap + mount_path: /var/run/osac-installer-aap + env: + - name: E2E_NAMESPACE + default: "osac-e2e-ci" + documentation: The namespace to use for OSAC deployment + - name: E2E_KUSTOMIZE_OVERLAY + default: "vmaas-ci" + documentation: The kustomize overlay to use + - name: E2E_VM_TEMPLATE + default: "osac.templates.ocp_virt_vm" + documentation: The VM template to publish + - name: COMPONENT_IMAGE_NAME + default: "" + documentation: Image name to override (e.g. ghcr.io/osac-project/fulfillment-service) + - name: CLUSTER_TOOL_COMMIT + default: "main" + documentation: cluster-tool git ref to download (branch, tag, or commit) + - name: CLUSTER_TOOL_FLAVOR_IMAGE + default: "quay.io/rh-ee-ovishlit/cluster-flavors:osac-vmaas" + documentation: OCI image containing the OSAC snapshot flavor + documentation: |- + Boots an OSAC cluster from a pre-built snapshot using cluster-tool, + then refreshes domain-sensitive resources. Optionally overrides a + component image for PR testing. diff --git a/ci-operator/step-registry/osac-project/installer/OWNERS b/ci-operator/step-registry/osac-project/cluster-tool/destroy/OWNERS similarity index 100% rename from ci-operator/step-registry/osac-project/installer/OWNERS rename to ci-operator/step-registry/osac-project/cluster-tool/destroy/OWNERS diff --git a/ci-operator/step-registry/osac-project/cluster-tool/destroy/osac-project-cluster-tool-destroy-commands.sh b/ci-operator/step-registry/osac-project/cluster-tool/destroy/osac-project-cluster-tool-destroy-commands.sh new file mode 100644 index 0000000000000..84187dad71e98 --- /dev/null +++ b/ci-operator/step-registry/osac-project/cluster-tool/destroy/osac-project-cluster-tool-destroy-commands.sh @@ -0,0 +1,22 @@ +#!/bin/bash + +set -o nounset +set -o pipefail + +echo "************ cluster-tool destroy ************" + +CLONE_NAME="ci-test" + +timeout -s 9 5m ssh -F "${SHARED_DIR}/ssh_config" ci_machine bash -s "${CLONE_NAME}" <<'REMOTE_EOF' || true +set -o pipefail +CLONE="$1" + +if command -v cluster-tool &>/dev/null || [[ -f /usr/local/bin/cluster-tool ]]; then + echo "Destroying clone ${CLONE}..." + python3 /usr/local/bin/cluster-tool destroy "${CLONE}" 2>&1 || true +else + echo "cluster-tool not found, skipping cleanup" +fi +REMOTE_EOF + +echo "Destroy step finished." diff --git a/ci-operator/step-registry/osac-project/installer/component/osac-project-installer-component-ref.metadata.json b/ci-operator/step-registry/osac-project/cluster-tool/destroy/osac-project-cluster-tool-destroy-ref.metadata.json similarity index 50% rename from ci-operator/step-registry/osac-project/installer/component/osac-project-installer-component-ref.metadata.json rename to ci-operator/step-registry/osac-project/cluster-tool/destroy/osac-project-cluster-tool-destroy-ref.metadata.json index d126d5daa3c9d..b192e56254ce7 100644 --- a/ci-operator/step-registry/osac-project/installer/component/osac-project-installer-component-ref.metadata.json +++ b/ci-operator/step-registry/osac-project/cluster-tool/destroy/osac-project-cluster-tool-destroy-ref.metadata.json @@ -1,5 +1,5 @@ { - "path": "osac-project/installer/component/osac-project-installer-component-ref.yaml", + "path": "osac-project/cluster-tool/destroy/osac-project-cluster-tool-destroy-ref.yaml", "owners": { "approvers": [ "osac-cicd" diff --git a/ci-operator/step-registry/osac-project/cluster-tool/destroy/osac-project-cluster-tool-destroy-ref.yaml b/ci-operator/step-registry/osac-project/cluster-tool/destroy/osac-project-cluster-tool-destroy-ref.yaml new file mode 100644 index 0000000000000..ffd65c9a014b3 --- /dev/null +++ b/ci-operator/step-registry/osac-project/cluster-tool/destroy/osac-project-cluster-tool-destroy-ref.yaml @@ -0,0 +1,13 @@ +ref: + as: osac-project-cluster-tool-destroy + from: dev-scripts + best_effort: true + grace_period: 5m + timeout: 10m0s + commands: osac-project-cluster-tool-destroy-commands.sh + resources: + requests: + cpu: 100m + memory: 200Mi + documentation: |- + Best-effort cleanup of a cluster-tool clone. Runs in post steps. diff --git a/ci-operator/step-registry/osac-project/installer/component/OWNERS b/ci-operator/step-registry/osac-project/cluster-tool/test/OWNERS similarity index 100% rename from ci-operator/step-registry/osac-project/installer/component/OWNERS rename to ci-operator/step-registry/osac-project/cluster-tool/test/OWNERS diff --git a/ci-operator/step-registry/osac-project/cluster-tool/test/osac-project-cluster-tool-test-commands.sh b/ci-operator/step-registry/osac-project/cluster-tool/test/osac-project-cluster-tool-test-commands.sh new file mode 100644 index 0000000000000..11918fba9c82a --- /dev/null +++ b/ci-operator/step-registry/osac-project/cluster-tool/test/osac-project-cluster-tool-test-commands.sh @@ -0,0 +1,89 @@ +#!/bin/bash + +set -o nounset +set -o errexit +set -o pipefail + +echo "************ cluster-tool vmaas test ************" +echo "Running ALL vmaas tests sequentially" +echo "OSAC_TEST_IMAGE: ${OSAC_TEST_IMAGE}" +echo "E2E_NAMESPACE: ${E2E_NAMESPACE}" +echo "E2E_VM_TEMPLATE: ${E2E_VM_TEMPLATE}" +echo "-------------------------------------------" + +CLONE_NAME="ci-test" +KUBECONFIG_PATH="/root/.kube/${CLONE_NAME}.kubeconfig" +REMOTE_RESULTS_DIR="/tmp/test-results" + +function collect_artifacts() { + echo "Collecting test artifacts..." + timeout -s 9 2m scp -F "${SHARED_DIR}/ssh_config" \ + "ci_machine:${REMOTE_RESULTS_DIR}/junit_vmaas.xml" \ + "${ARTIFACT_DIR}/junit_vmaas.xml" 2>/dev/null || true +} +trap collect_artifacts EXIT + +TEST_EXIT=0 +timeout -s 9 60m ssh -F "${SHARED_DIR}/ssh_config" ci_machine bash -s \ + "${E2E_NAMESPACE}" \ + "${E2E_VM_TEMPLATE}" \ + "${E2E_CLUSTER_TEMPLATE}" \ + "${OSAC_TEST_IMAGE}" \ + "${KUBECONFIG_PATH}" \ + "${REMOTE_RESULTS_DIR}" \ + <<'REMOTE_EOF' || TEST_EXIT=$? +set -euo pipefail + +NAMESPACE="$1" +VM_TEMPLATE="$2" +CLUSTER_TEMPLATE="$3" +TEST_IMAGE="$4" +KUBECONFIG_PATH="$5" +RESULTS_DIR="$6" + +mkdir -p "${RESULTS_DIR}" + +export KUBECONFIG="${KUBECONFIG_PATH}" +echo "Waiting for KubeVirt to be Available..." +for attempt in $(seq 1 60); do + AVAILABLE=$(oc get hyperconverged kubevirt-hyperconverged -n openshift-cnv -o jsonpath='{.status.conditions[?(@.type=="Available")].status}' 2>/dev/null || echo "Unknown") + if [[ "${AVAILABLE}" == "True" ]]; then + echo " KubeVirt Available after $((attempt * 10))s" + break + fi + if [[ $((attempt % 6)) -eq 0 ]]; then + PROGRESSING=$(oc get hyperconverged kubevirt-hyperconverged -n openshift-cnv -o jsonpath='{.status.conditions[?(@.type=="Progressing")].message}' 2>/dev/null || echo "unknown") + echo " [${attempt}0s] KubeVirt not Available yet: ${PROGRESSING}" + fi + sleep 10 +done +if [[ "${AVAILABLE}" != "True" ]]; then + echo "ERROR: KubeVirt not Available after 600s" + oc get hyperconverged kubevirt-hyperconverged -n openshift-cnv -o yaml 2>/dev/null || true + exit 1 +fi +unset KUBECONFIG + +echo "Running vmaas tests..." +podman run --authfile /root/pull-secret --rm --network=host \ + -v "${KUBECONFIG_PATH}":/root/.kube/config:z \ + -v /root/pull-secret:/root/pull-secret:z \ + -v "${RESULTS_DIR}":/tmp/test-results:z \ + -e KUBECONFIG=/root/.kube/config \ + -e OSAC_VM_KUBECONFIG=/root/.kube/config \ + -e OSAC_NAMESPACE="${NAMESPACE}" \ + -e OSAC_VM_TEMPLATE="${VM_TEMPLATE}" \ + -e OSAC_CLUSTER_TEMPLATE="${CLUSTER_TEMPLATE}" \ + -e OSAC_PULL_SECRET_PATH=/root/pull-secret \ + "${TEST_IMAGE}" \ + pytest tests/vmaas/ -v --junitxml=/tmp/test-results/junit_vmaas.xml + +echo "Tests completed." +REMOTE_EOF + +if [[ "${TEST_EXIT}" -ne 0 ]]; then + echo "Some tests failed (exit code: ${TEST_EXIT})" + exit "${TEST_EXIT}" +fi + +echo "All tests passed." diff --git a/ci-operator/step-registry/osac-project/installer/osac-project-installer-ref.metadata.json b/ci-operator/step-registry/osac-project/cluster-tool/test/osac-project-cluster-tool-test-ref.metadata.json similarity index 52% rename from ci-operator/step-registry/osac-project/installer/osac-project-installer-ref.metadata.json rename to ci-operator/step-registry/osac-project/cluster-tool/test/osac-project-cluster-tool-test-ref.metadata.json index 46d10561390f4..b2a8c447fad44 100644 --- a/ci-operator/step-registry/osac-project/installer/osac-project-installer-ref.metadata.json +++ b/ci-operator/step-registry/osac-project/cluster-tool/test/osac-project-cluster-tool-test-ref.metadata.json @@ -1,5 +1,5 @@ { - "path": "osac-project/installer/osac-project-installer-ref.yaml", + "path": "osac-project/cluster-tool/test/osac-project-cluster-tool-test-ref.yaml", "owners": { "approvers": [ "osac-cicd" diff --git a/ci-operator/step-registry/osac-project/baremetal/test/osac-project-baremetal-test-ref.yaml b/ci-operator/step-registry/osac-project/cluster-tool/test/osac-project-cluster-tool-test-ref.yaml similarity index 53% rename from ci-operator/step-registry/osac-project/baremetal/test/osac-project-baremetal-test-ref.yaml rename to ci-operator/step-registry/osac-project/cluster-tool/test/osac-project-cluster-tool-test-ref.yaml index e130a64353435..ada6fd6ca5d5d 100644 --- a/ci-operator/step-registry/osac-project/baremetal/test/osac-project-baremetal-test-ref.yaml +++ b/ci-operator/step-registry/osac-project/cluster-tool/test/osac-project-cluster-tool-test-ref.yaml @@ -1,25 +1,26 @@ ref: - as: osac-project-baremetal-test + as: osac-project-cluster-tool-test from: dev-scripts dependencies: - name: osac-test-infra env: OSAC_TEST_IMAGE grace_period: 10m - timeout: 3h0m0s - commands: osac-project-baremetal-test-commands.sh + timeout: 1h30m0s + commands: osac-project-cluster-tool-test-commands.sh resources: requests: cpu: 100m memory: 200Mi env: - - name: TEST - documentation: The test file to run (e.g. test_compute_instance_creation.py) - name: E2E_NAMESPACE default: "osac-e2e-ci" documentation: The namespace to use for the e2e tests - name: E2E_VM_TEMPLATE default: "osac.templates.ocp_virt_vm" - documentation: The VM template to use for the e2e tests + documentation: The VM template to use for vmaas tests - name: E2E_CLUSTER_TEMPLATE default: "osac.templates.ocp_4_17_small" - documentation: The cluster template to use for CaaS e2e tests + documentation: The cluster template to use for CaaS tests + documentation: |- + Runs all vmaas e2e tests sequentially on a cluster-tool booted cluster. + Produces JUnit XML for per-test reporting in Prow. diff --git a/ci-operator/step-registry/osac-project/ofcir/OWNERS b/ci-operator/step-registry/osac-project/cluster-tool/vmaas/OWNERS similarity index 100% rename from ci-operator/step-registry/osac-project/ofcir/OWNERS rename to ci-operator/step-registry/osac-project/cluster-tool/vmaas/OWNERS diff --git a/ci-operator/step-registry/osac-project/ofcir/baremetal/osac-project-ofcir-baremetal-workflow.metadata.json b/ci-operator/step-registry/osac-project/cluster-tool/vmaas/osac-project-cluster-tool-vmaas-workflow.metadata.json similarity index 50% rename from ci-operator/step-registry/osac-project/ofcir/baremetal/osac-project-ofcir-baremetal-workflow.metadata.json rename to ci-operator/step-registry/osac-project/cluster-tool/vmaas/osac-project-cluster-tool-vmaas-workflow.metadata.json index cffa8269c8eaa..8ed75b73acb2a 100644 --- a/ci-operator/step-registry/osac-project/ofcir/baremetal/osac-project-ofcir-baremetal-workflow.metadata.json +++ b/ci-operator/step-registry/osac-project/cluster-tool/vmaas/osac-project-cluster-tool-vmaas-workflow.metadata.json @@ -1,5 +1,5 @@ { - "path": "osac-project/ofcir/baremetal/osac-project-ofcir-baremetal-workflow.yaml", + "path": "osac-project/cluster-tool/vmaas/osac-project-cluster-tool-vmaas-workflow.yaml", "owners": { "approvers": [ "osac-cicd" diff --git a/ci-operator/step-registry/osac-project/cluster-tool/vmaas/osac-project-cluster-tool-vmaas-workflow.yaml b/ci-operator/step-registry/osac-project/cluster-tool/vmaas/osac-project-cluster-tool-vmaas-workflow.yaml new file mode 100644 index 0000000000000..1a63c22a1f7af --- /dev/null +++ b/ci-operator/step-registry/osac-project/cluster-tool/vmaas/osac-project-cluster-tool-vmaas-workflow.yaml @@ -0,0 +1,23 @@ +workflow: + as: osac-project-cluster-tool-vmaas + steps: + cluster_profile: packet-assisted + allow_best_effort_post_steps: true + allow_skip_on_success: true + pre: + - ref: ofcir-acquire + - ref: osac-project-cluster-tool-boot + test: + - ref: osac-project-cluster-tool-test + post: + - ref: osac-project-gather + - ref: osac-project-cluster-tool-destroy + - ref: ofcir-gather + - ref: ofcir-release + env: + CLUSTERTYPE: "assisted_large_el9" + documentation: |- + Boots an OSAC cluster from a pre-built snapshot via cluster-tool, + runs the refresh script to fix domain-sensitive resources, then + executes all vmaas e2e tests on the single cluster. + Replaces the per-test osac-project-ofcir-baremetal workflow. diff --git a/ci-operator/step-registry/osac-project/gather/osac-project-gather-commands.sh b/ci-operator/step-registry/osac-project/gather/osac-project-gather-commands.sh index 448c958a7644a..e92100c1ba6ff 100644 --- a/ci-operator/step-registry/osac-project/gather/osac-project-gather-commands.sh +++ b/ci-operator/step-registry/osac-project/gather/osac-project-gather-commands.sh @@ -62,6 +62,33 @@ for ns in keycloak ansible-aap; do fi done +echo "=== Collecting CNV/virtualization diagnostics ===" +mkdir -p "${ARTIFACT_DIR}/cnv" +oc get hyperconverged -A -o yaml > "${ARTIFACT_DIR}/cnv/hyperconverged.yaml" 2>&1 || true +oc get vms -n "${E2E_NAMESPACE}" -o wide > "${ARTIFACT_DIR}/cnv/vms.txt" 2>&1 || true +oc get vmis -n "${E2E_NAMESPACE}" -o wide > "${ARTIFACT_DIR}/cnv/vmis.txt" 2>&1 || true +oc get datavolumes -n "${E2E_NAMESPACE}" -o wide > "${ARTIFACT_DIR}/cnv/datavolumes.txt" 2>&1 || true +oc get pvc -n "${E2E_NAMESPACE}" -o wide > "${ARTIFACT_DIR}/cnv/pvcs.txt" 2>&1 || true +oc get events -n openshift-cnv --sort-by=.lastTimestamp > "${ARTIFACT_DIR}/cnv/events-openshift-cnv.txt" 2>&1 || true + +echo "=== Collecting compute instance status ===" +oc get computeinstances -n "${E2E_NAMESPACE}" -o wide > "${ARTIFACT_DIR}/computeinstances.txt" 2>&1 || true +oc get computeinstances -n "${E2E_NAMESPACE}" -o yaml > "${ARTIFACT_DIR}/computeinstances.yaml" 2>&1 || true + +echo "=== Collecting node resource usage ===" +oc adm top node > "${ARTIFACT_DIR}/node-resources.txt" 2>&1 || true +oc adm top pod -n "${E2E_NAMESPACE}" --sort-by=memory > "${ARTIFACT_DIR}/pod-resources.txt" 2>&1 || true +oc get nodes -o wide > "${ARTIFACT_DIR}/nodes.txt" 2>&1 || true +oc describe node > "${ARTIFACT_DIR}/node-describe.txt" 2>&1 || true + +echo "=== Collecting cluster operator status ===" +oc get co > "${ARTIFACT_DIR}/clusteroperators.txt" 2>&1 || true +oc get csv -n openshift-cnv -o wide > "${ARTIFACT_DIR}/cnv/csv.txt" 2>&1 || true + +echo "=== Collecting AAP operator status ===" +oc get ansibleautomationplatform -n "${E2E_NAMESPACE}" -o yaml > "${ARTIFACT_DIR}/aap-status.yaml" 2>&1 || true +oc get automationcontroller -n "${E2E_NAMESPACE}" -o yaml > "${ARTIFACT_DIR}/automationcontroller-status.yaml" 2>&1 || true + echo "Log collection complete" REMOTE_EOF diff --git a/ci-operator/step-registry/osac-project/installer/component/osac-project-installer-component-commands.sh b/ci-operator/step-registry/osac-project/installer/component/osac-project-installer-component-commands.sh deleted file mode 100644 index 17c7da907deae..0000000000000 --- a/ci-operator/step-registry/osac-project/installer/component/osac-project-installer-component-commands.sh +++ /dev/null @@ -1,99 +0,0 @@ -#!/bin/bash - -set -o nounset -set -o errexit -set -o pipefail - -echo "************ osac-installer-component commands ************" -echo "--- Running with the following parameters ---" -echo "E2E_NAMESPACE: ${E2E_NAMESPACE}" -echo "E2E_KUSTOMIZE_OVERLAY: ${E2E_KUSTOMIZE_OVERLAY}" -echo "E2E_VM_TEMPLATE: ${E2E_VM_TEMPLATE}" -echo "OSAC_INSTALLER_IMAGE: ${OSAC_INSTALLER_IMAGE}" -echo "COMPONENT_IMAGE: ${COMPONENT_IMAGE}" -echo "COMPONENT_IMAGE_NAME: ${COMPONENT_IMAGE_NAME}" -echo "AAP_EE_IMAGE_OVERRIDE: ${AAP_EE_IMAGE_OVERRIDE:-}" -echo "-------------------------------------------" - -base64 -d /var/run/osac-installer-aap/license > /tmp/license.zip - -timeout -s 9 10m scp -F "${SHARED_DIR}/ssh_config" /tmp/license.zip ci_machine:/tmp/license.zip - -timeout -s 9 120m ssh -F "${SHARED_DIR}/ssh_config" ci_machine bash - << EOF|& sed -e 's/.*auths\{0,1\}".*/*** PULL_SECRET ***/g' - -export KUBECONFIG=\$(find \${KUBECONFIG} -type f -print -quit) - -oc annotate sc lvms-vg1 storageclass.kubernetes.io/is-default-class=true --overwrite - -echo "Waiting for OpenShift Virtualization to be ready..." -oc wait --for=condition=Available hyperconverged/kubevirt-hyperconverged -n openshift-cnv --timeout=900s - -cat < \${COMPONENT_IMAGE}" -cd /installer/base - -if ! grep -Fq "name: \${COMPONENT_IMAGE_NAME}" kustomization.yaml; then - echo "ERROR: image name \${COMPONENT_IMAGE_NAME} not found in /installer/base/kustomization.yaml" >&2 - cat kustomization.yaml >&2 - exit 1 -fi - -if grep -A1 "name: \${COMPONENT_IMAGE_NAME}" kustomization.yaml | grep -q "newName:"; then - sed -i "\#name: \${COMPONENT_IMAGE_NAME}#,/newTag:/{ - s|newName:.*|newName: \${COMPONENT_REGISTRY}| - s|newTag:.*|newTag: \${COMPONENT_TAG}| - }" kustomization.yaml -else - sed -i "\#name: \${COMPONENT_IMAGE_NAME}#{ - a\\ newName: \${COMPONENT_REGISTRY} - n - s|newTag:.*|newTag: \${COMPONENT_TAG}| - }" kustomization.yaml -fi - -if ! grep -Fq "\${COMPONENT_REGISTRY}" kustomization.yaml || ! grep -Fq "newTag: \${COMPONENT_TAG}" kustomization.yaml; then - echo "ERROR: kustomize image override failed — expected \${COMPONENT_REGISTRY}:\${COMPONENT_TAG}" >&2 - cat kustomization.yaml >&2 - exit 1 -fi - -if [ -n "\${AAP_EE_IMAGE_OVERRIDE}" ]; then - overlay_file="/installer/overlays/\${INSTALLER_KUSTOMIZE_OVERLAY}/kustomization.yaml" - if ! grep -q "AAP_EE_IMAGE=" "\${overlay_file}"; then - echo "ERROR: AAP_EE_IMAGE entry not found in \${overlay_file}" >&2 - exit 1 - fi - echo "Overriding AAP_EE_IMAGE -> \${COMPONENT_IMAGE}" - sed -i "s|AAP_EE_IMAGE=.*|AAP_EE_IMAGE=\${COMPONENT_IMAGE}|" "\${overlay_file}" -fi - -cd /installer -sh scripts/setup.sh -' - -EOF diff --git a/ci-operator/step-registry/osac-project/installer/component/osac-project-installer-component-ref.yaml b/ci-operator/step-registry/osac-project/installer/component/osac-project-installer-component-ref.yaml deleted file mode 100644 index 825cc1e43073d..0000000000000 --- a/ci-operator/step-registry/osac-project/installer/component/osac-project-installer-component-ref.yaml +++ /dev/null @@ -1,34 +0,0 @@ -ref: - as: osac-project-installer-component - from: dev-scripts - dependencies: - - name: osac-installer - env: OSAC_INSTALLER_IMAGE - - name: component-image - env: COMPONENT_IMAGE - grace_period: 10m - timeout: 3h0m0s - commands: osac-project-installer-component-commands.sh - resources: - requests: - cpu: 100m - memory: 200Mi - credentials: - - namespace: test-credentials - name: osac-installer-aap - mount_path: /var/run/osac-installer-aap - env: - - name: E2E_NAMESPACE - default: "osac-e2e-ci" - documentation: The namespace to use for the e2e tests - - name: E2E_KUSTOMIZE_OVERLAY - default: "vmaas-ci" - documentation: The kustomize overlay to use for the e2e tests - - name: E2E_VM_TEMPLATE - default: "osac.templates.ocp_virt_vm" - documentation: The template to use for the e2e tests - - name: COMPONENT_IMAGE_NAME - documentation: The image name in base/kustomization.yaml to replace (e.g. ghcr.io/osac-project/fulfillment-service) - - name: AAP_EE_IMAGE_OVERRIDE - default: "" - documentation: If non-empty, also override AAP_EE_IMAGE in the overlay kustomization to use COMPONENT_IMAGE diff --git a/ci-operator/step-registry/osac-project/installer/osac-project-installer-commands.sh b/ci-operator/step-registry/osac-project/installer/osac-project-installer-commands.sh deleted file mode 100644 index e2af4ab09b036..0000000000000 --- a/ci-operator/step-registry/osac-project/installer/osac-project-installer-commands.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/bash - -set -o nounset -set -o errexit -set -o pipefail - -echo "************ osac-installer commands ************" -echo "--- Running with the following parameters ---" -echo "E2E_NAMESPACE: ${E2E_NAMESPACE}" -echo "E2E_KUSTOMIZE_OVERLAY: ${E2E_KUSTOMIZE_OVERLAY}" -echo "E2E_VM_TEMPLATE: ${E2E_VM_TEMPLATE}" -echo "OSAC_INSTALLER_IMAGE: ${OSAC_INSTALLER_IMAGE}" -echo "-------------------------------------------" - -base64 -d /var/run/osac-installer-aap/license > /tmp/license.zip - -timeout -s 9 10m scp -F "${SHARED_DIR}/ssh_config" /tmp/license.zip ci_machine:/tmp/license.zip - -timeout -s 9 120m ssh -F "${SHARED_DIR}/ssh_config" ci_machine bash - << EOF|& sed -e 's/.*auths\{0,1\}".*/*** PULL_SECRET ***/g' - -export KUBECONFIG=\$(find \${KUBECONFIG} -type f -print -quit) - -oc annotate sc lvms-vg1 storageclass.kubernetes.io/is-default-class=true --overwrite - -echo "Waiting for OpenShift Virtualization to be ready..." -oc wait --for=condition=Available hyperconverged/kubevirt-hyperconverged -n openshift-cnv --timeout=900s - -cat <