Merge "removing deprecated jjbs"

diff --combined jjb/metal3/projects.yml
index 9e5dc58506eff29b8d3e0c27450963a4797a4fc3,a5f86f360f4d59dd58edbc68bece6bdd01353d47..f935b1ee3a656931c020cbeeb1b03f21e875183b
--- 1/jjb/metal3/projects.yml
--- 2/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@@ -132,65 -132,6 +132,6 @@@
      jobs:
      - integration_tests
  
- - project:
-     name: keep-integration-tests-alive
-     org: metal3-io
-     proj:
-     - metal3_dev_env:
-         repo: metal3-dev-env
-     - project_infra:
-         repo: project-infra
-         branch: '${{ghprbActualCommit}}'
-         ci_github_repo: '${{ghprbAuthorRepoGitUrl}}'
-     - capm3:
-         repo: cluster-api-provider-metal3
-     - bmo:
-         repo: baremetal-operator
-     - ipam:
-         repo: ip-address-manager
-     - ironic_image:
-         repo: ironic-image
-     image_os:
-     - ubuntu
-     - centos
-     capm3_target_branch:
-     - main:
-         capi_version: v1beta1
-         capm3_version: v1beta1
-         capm3_release_branch: main
-         bmo_release_branch: main
-         target_branches:
-         - 'main'
-     - release-1-6:
-         capi_version: v1beta1
-         capm3_version: v1beta1
-         capm3_release_branch: release-1.6
-         bmo_release_branch: release-0.5
-         target_branches:
-         - 'main'
-         - 'release-1.6'
-         - 'release-0.5'
-     - release-1-5:
-         capi_version: v1beta1
-         capm3_version: v1beta1
-         capm3_release_branch: release-1.5
-         bmo_release_branch: release-0.4
-         target_branches:
-         - 'main'
-         - 'release-1.5'
-         - 'release-0.4'
-     - release-1-4:
-         capi_version: v1beta1
-         capm3_version: v1beta1
-         capm3_release_branch: release-1.4
-         bmo_release_branch: release-0.3
-         target_branches:
-         - 'main'
-         - 'release-1.4'
-         - 'release-0.3'
-     jobs:
-     - keep_integration_tests
- 
  - project:
      name: metal3-dev-env-main-tests
      org: metal3-io
@@@ -256,354 -197,6 +197,6 @@@
      jobs:
      - fullstack_project-infra_building_test
  
- - project:
-     name: "capm3"
-     org: metal3-io
-     proj:
-     - capm3:
-         repo: cluster-api-provider-metal3
-     - metal3_dev_env:
-         repo: metal3-dev-env
-     - project_infra:
-         repo: project-infra
-         branch: '${{ghprbActualCommit}}'
-         ci_github_repo: '${{ghprbAuthorRepoGitUrl}}'
-     - bmo:
-         repo: baremetal-operator
-     - ipam:
-         repo: ip-address-manager
-     image_os:
-     - ubuntu
-     - centos
-     jobs:
-     - capm3_e2e_k8s_upgrade_tests:
-         k8s_versions:
-         - 1-28-1-29:
-             k8s_version_upgrade_from: v1.28.1
-             k8s_version_upgrade_to: v1.29.0
-             kubectl_sha256: 0e03ab096163f61ab610b33f37f55709d3af8e16e4dcc1eb682882ef80f96fd5 # v1.29.0
-             capm3_release_branch: main
-             bmo_release_branch: main
-             capm3_target_branch: main
-             target_branches:
-             - 'main'
-         - 1-27-1-28:
-             k8s_version_upgrade_from: v1.27.4
-             k8s_version_upgrade_to: v1.28.1
-             kubectl_sha256: e7a7d6f9d06fab38b4128785aa80f65c54f6675a0d2abef655259ddd852274e1 # v1.28.1
-             capm3_release_branch: main
-             bmo_release_branch: main
-             capm3_target_branch: main
-             target_branches:
-             - 'main'
-         - 1-26-1-27:
-             k8s_version_upgrade_from: v1.26.4
-             k8s_version_upgrade_to: v1.27.4
-             kubectl_sha256: 4685bfcf732260f72fce58379e812e091557ef1dfc1bc8084226c7891dd6028f # v1.27.4
-             capm3_release_branch: main
-             capm3_target_branch: main
-             bmo_release_branch: main
-             target_branches:
-             - 'main'
-         - 1-28-1-29:
-             k8s_version_upgrade_from: v1.28.1
-             k8s_version_upgrade_to: v1.29.0
-             kubectl_sha256: 0e03ab096163f61ab610b33f37f55709d3af8e16e4dcc1eb682882ef80f96fd5 # v1.29.0
-             capm3_release_branch: release-1.6
-             bmo_release_branch: release-0.5
-             capm3_target_branch: release-1-6
-             target_branches:
-             - 'release-1.6'
-             - 'release-0.5'
-         - 1-26-1-27:
-             k8s_version_upgrade_from: v1.26.4
-             k8s_version_upgrade_to: v1.27.4
-             kubectl_sha256: 4685bfcf732260f72fce58379e812e091557ef1dfc1bc8084226c7891dd6028f # v1.27.4
-             capm3_release_branch: release-1.5
-             bmo_release_branch: release-0.4
-             capm3_target_branch: release-1-5
-             target_branches:
-             - 'release-1.5'
-             - 'release-0.4'
-         - 1-26-1-27:
-             k8s_version_upgrade_from: v1.26.4
-             kubectl_sha256: 636ac0eaa467dbceda4b2c4e33662adc9709f5ce40341c9fc1a687fc276ac02d # v1.26.4
-             k8s_version_upgrade_to: v1.27.4
-             capm3_release_branch: release-1.4
-             bmo_release_branch: release-0.3
-             capm3_target_branch: release-1-4
-             target_branches:
-             - 'release-1.4'
-             - 'release-0.3'
-         exclude:
-         - image_os: centos
-     - capm3_e2e_integration_tests:
-         capm3_target_branch:
-         - main:
-             capi_version: v1beta1
-             capm3_version: v1beta1
-             capm3_release_branch: main
-             bmo_release_branch: main
-             target_branches:
-             - 'main'
-         - release-1-6:
-             capi_version: v1beta1
-             capm3_version: v1beta1
-             capm3_release_branch: release-1.6
-             bmo_release_branch: release-0.5
-             target_branches:
-             - 'main'
-             - 'release-1.6'
-             - 'release-0.5'
-         - release-1-5:
-             capi_version: v1beta1
-             capm3_version: v1beta1
-             capm3_release_branch: release-1.5
-             bmo_release_branch: release-0.4
-             target_branches:
-             - 'main'
-             - 'release-1.5'
-             - 'release-0.4'
-         - release-1-4:
-             capi_version: v1beta1
-             capm3_version: v1beta1
-             capm3_release_branch: release-1.4
-             bmo_release_branch: release-0.3
-             target_branches:
-             - 'main'
-             - 'release-1.4'
-             - 'release-0.3'
-     - capm3_e2e_feature_tests:
-         capm3_target_branch:
-         - main:
-             capi_version: v1beta1
-             capm3_version: v1beta1
-             capm3_release_branch: main
-             bmo_release_branch: main
-             target_branches:
-             - 'main'
-         - release-1-6:
-             capi_version: v1beta1
-             capm3_version: v1beta1
-             capm3_release_branch: release-1.6
-             bmo_release_branch: release-0.5
-             target_branches:
-             - 'release-1.6'
-             - 'release-0.5'
-         - release-1-5:
-             capi_version: v1beta1
-             capm3_version: v1beta1
-             capm3_release_branch: release-1.5
-             bmo_release_branch: release-0.4
-             target_branches:
-             - 'release-1.5'
-             - 'release-0.4'
-         - release-1-4:
-             capi_version: v1beta1
-             capm3_version: v1beta1
-             capm3_release_branch: release-1.4
-             bmo_release_branch: release-0.3
-             target_branches:
-             - 'release-1.4'
-             - 'release-0.3'
-     - capm3_clusterctl_upgrade_tests:
-         capm3_target_branch:
-         - main:
-             capi_version: v1beta1
-             capm3_version: v1beta1
-             capm3_release_branch: main
-             bmo_release_branch: main
-             target_branches:
-             - 'main'
-         - release-1-6:
-             capi_version: v1beta1
-             capm3_version: v1beta1
-             capm3_release_branch: release-1.6
-             bmo_release_branch: release-0.5
-             target_branches:
-             - 'release-1.6'
-             - 'release-0.5'
-         - release-1-5:
-             capi_version: v1beta1
-             capm3_version: v1beta1
-             capm3_release_branch: release-1.5
-             bmo_release_branch: release-0.4
-             target_branches:
-             - 'release-1.5'
-             - 'release-0.4'
-         - release-1-4:
-             capi_version: v1beta1
-             capm3_version: v1beta1
-             capm3_release_branch: release-1.4
-             bmo_release_branch: release-0.3
-             target_branches:
-             - 'release-1.4'
-             - 'release-0.3'
-         exclude:
-         - image_os: centos
-     - keep_capm3_e2e_integration_tests:
-         capm3_target_branch:
-         - main:
-             capi_version: v1beta1
-             capm3_version: v1beta1
-             capm3_release_branch: main
-             bmo_release_branch: main
-             target_branches:
-             - 'main'
-         - release-1-6:
-             capi_version: v1beta1
-             capm3_version: v1beta1
-             capm3_release_branch: release-1.6
-             bmo_release_branch: release-0.5
-             target_branches:
-             - 'main'
-             - 'release-1.6'
-             - 'release-0.5'
-         - release-1-5:
-             capi_version: v1beta1
-             capm3_version: v1beta1
-             capm3_release_branch: release-1.5
-             bmo_release_branch: release-0.4
-             target_branches:
-             - 'main'
-             - 'release-1.5'
-             - 'release-0.4'
-         - release-1-4:
-             capi_version: v1beta1
-             capm3_version: v1beta1
-             capm3_release_branch: release-1.4
-             bmo_release_branch: release-0.3
-             target_branches:
-             - 'main'
-             - 'release-1.4'
-             - 'release-0.3'
-     - keep_capm3_e2e_basic_tests:
-         capm3_target_branch:
-         - main:
-             capi_version: v1beta1
-             capm3_version: v1beta1
-             capm3_release_branch: main
-             bmo_release_branch: main
-             target_branches:
-             - 'main'
-         - release-1-6:
-             capi_version: v1beta1
-             capm3_version: v1beta1
-             capm3_release_branch: release-1.6
-             bmo_release_branch: release-0.5
-             target_branches:
-             - 'main'
-             - 'release-1.6'
-             - 'release-0.5'
-     - keep_capm3_e2e_feature_tests:
-         capm3_target_branch:
-         - main:
-             capi_version: v1beta1
-             capm3_version: v1beta1
-             capm3_release_branch: main
-             bmo_release_branch: main
-             target_branches:
-             - 'main'
-         - release-1-6:
-             capi_version: v1beta1
-             capm3_version: v1beta1
-             capm3_release_branch: release-1.6
-             bmo_release_branch: release-0.5
-             target_branches:
-             - 'release-1.6'
-             - 'release-0.5'
-         - release-1-5:
-             capi_version: v1beta1
-             capm3_version: v1beta1
-             capm3_release_branch: release-1.5
-             bmo_release_branch: release-0.4
-             target_branches:
-             - 'release-1.5'
-             - 'release-0.4'
-         - release-1-4:
-             capi_version: v1beta1
-             capm3_version: v1beta1
-             capm3_release_branch: release-1.4
-             bmo_release_branch: release-0.3
-             target_branches:
-             - 'release-1.4'
-             - 'release-0.3'
-     - keep_capm3_e2e_clusterctl_upgrade_tests:
-         upgrade_from_release:
-         - from-release-1-6:
-             upgrade_from: v1.6.
-         - from-release-1-5:
-             upgrade_from: v1.5.
-         - from-release-1-4:
-             upgrade_from: v1.4.
-         - from-release-1-3:
-             upgrade_from: v1.3.
-         - from-release-0-5:
-             upgrade_from: v0.5.
-         exclude:
-         - image_os: centos
-     - keep_capm3_e2e_k8s_upgrade_tests:
-         k8s_versions:
-         - 1-28-1-29:
-             k8s_version_upgrade_from: v1.28.1
-             k8s_version_upgrade_to: v1.29.0
-             kubectl_sha256: 0e03ab096163f61ab610b33f37f55709d3af8e16e4dcc1eb682882ef80f96fd5 # v1.29.0
-             capm3_release_branch: main
-             bmo_release_branch: main
-             capm3_target_branch: main
-             target_branches:
-             - 'main'
-         - 1-27-1-28:
-             k8s_version_upgrade_from: v1.27.4
-             k8s_version_upgrade_to: v1.28.1
-             kubectl_sha256: e7a7d6f9d06fab38b4128785aa80f65c54f6675a0d2abef655259ddd852274e1 # v1.28.1
-             capm3_release_branch: main
-             bmo_release_branch: main
-             capm3_target_branch: main
-             target_branches:
-             - 'main'
-         - 1-26-1-27:
-             k8s_version_upgrade_from: v1.26.4
-             k8s_version_upgrade_to: v1.27.4
-             kubectl_sha256: 4685bfcf732260f72fce58379e812e091557ef1dfc1bc8084226c7891dd6028f # v1.27.4
-             capm3_release_branch: main
-             bmo_release_branch: main
-             capm3_target_branch: main
-             target_branches:
-             - 'main'
-         - 1-28-1-29:
-             k8s_version_upgrade_from: v1.28.1
-             k8s_version_upgrade_to: v1.29.0
-             kubectl_sha256: 0e03ab096163f61ab610b33f37f55709d3af8e16e4dcc1eb682882ef80f96fd5 # v1.29.0
-             capm3_release_branch: release-1.6
-             bmo_release_branch: release-0.5
-             capm3_target_branch: release-1-6
-             target_branches:
-             - 'release-1.6'
-             - 'release-0.5'
-         - 1-26-1-27:
-             k8s_version_upgrade_from: v1.26.4
-             k8s_version_upgrade_to: v1.27.4
-             kubectl_sha256: 4685bfcf732260f72fce58379e812e091557ef1dfc1bc8084226c7891dd6028f # v1.27.4
-             capm3_release_branch: release-1.5
-             bmo_release_branch: release-0.4
-             capm3_target_branch: release-1-5
-             target_branches:
-             - 'release-1.5'
-             - 'release-0.4'
-         - 1-26-1-27:
-             k8s_version_upgrade_from: v1.26.4
-             kubectl_sha256: 636ac0eaa467dbceda4b2c4e33662adc9709f5ce40341c9fc1a687fc276ac02d # v1.26.4
-             k8s_version_upgrade_to: v1.27.4
-             capm3_release_branch: release-1.4
-             bmo_release_branch: release-0.3
-             capm3_target_branch: release-1-4
-             target_branches:
-             - 'release-1.4'
-             - 'release-0.3'
-         exclude:
-         - image_os: centos
- 
  - project:
      name: "capm3-prow"
      image_os:
@@@ -646,28 -239,6 +239,6 @@@
              capm3_release_branch: release-1.6
              bmo_release_branch: release-0.5
              schedule: "30 4 * * *"
-     - keep_capm3_e2e_integration_tests_prow:
-         capm3_target_branch:
-         - main:
-             capi_version: v1beta1
-             capm3_version: v1beta1
-             capm3_release_branch: main
-             bmo_release_branch: main
-         - release-1-6:
-             capi_version: v1beta1
-             capm3_version: v1beta1
-             capm3_release_branch: release-1.6
-             bmo_release_branch: release-0.5
-         - release-1-5:
-             capi_version: v1beta1
-             capm3_version: v1beta1
-             capm3_release_branch: release-1.5
-             bmo_release_branch: release-0.4
-         - release-1-4:
-             capi_version: v1beta1
-             capm3_version: v1beta1
-             capm3_release_branch: release-1.4
-             bmo_release_branch: release-0.3
      - capm3_e2e_feature_tests_prow:
          capm3_target_branch:
          - main:
@@@ -716,28 -287,6 +287,6 @@@
              capm3_release_branch: release-1.4
              bmo_release_branch: release-0.3
              schedule: "H 5 * * *"
-     - keep_capm3_e2e_feature_tests_prow:
-         capm3_target_branch:
-         - main:
-             capi_version: v1beta1
-             capm3_version: v1beta1
-             capm3_release_branch: main
-             bmo_release_branch: main
-         - release-1-6:
-             capi_version: v1beta1
-             capm3_version: v1beta1
-             capm3_release_branch: release-1.6
-             bmo_release_branch: release-0.5
-         - release-1-5:
-             capi_version: v1beta1
-             capm3_version: v1beta1
-             capm3_release_branch: release-1.5
-             bmo_release_branch: release-0.4
-         - release-1-4:
-             capi_version: v1beta1
-             capm3_version: v1beta1
-             capm3_release_branch: release-1.4
-             bmo_release_branch: release-0.3
      - capm3_e2e_clusterctl_upgrade_tests_prow:
          capm3_target_branch:
          - main:
@@@ -862,69 -411,6 +411,6 @@@
              capm3_target_branch: release-1-4
          exclude:
          - image_os: centos
-     - keep_capm3_e2e_clusterctl_upgrade_tests_prow:
-         capm3_target_branch:
-         - main:
-             capm3_release_branch: main
-             bmo_release_branch: main
-         - release-1-6:
-             capm3_release_branch: release-1.6
-             bmo_release_branch: release-0.5
-         - release-1-5:
-             capm3_release_branch: release-1.5
-             bmo_release_branch: release-0.4
-         - release-1-4:
-             capm3_release_branch: release-1.4
-             bmo_release_branch: release-0.3
-         exclude:
-         - image_os: centos
-     - keep_capm3_e2e_k8s_upgrade_tests_prow:
-         k8s_versions:
-         - 1-28-1-29:
-             k8s_version_upgrade_from: v1.28.1
-             k8s_version_upgrade_to: v1.29.0
-             kubectl_sha256: 0e03ab096163f61ab610b33f37f55709d3af8e16e4dcc1eb682882ef80f96fd5 # v1.29.0
-             capm3_release_branch: main
-             bmo_release_branch: main
-             capm3_target_branch: main
-         - 1-27-1-28:
-             k8s_version_upgrade_from: v1.27.4
-             k8s_version_upgrade_to: v1.28.1
-             kubectl_sha256: e7a7d6f9d06fab38b4128785aa80f65c54f6675a0d2abef655259ddd852274e1 # v1.28.1
-             capm3_release_branch: main
-             bmo_release_branch: main
-             capm3_target_branch: main
-         - 1-26-1-27:
-             k8s_version_upgrade_from: v1.26.4
-             k8s_version_upgrade_to: v1.27.4
-             kubectl_sha256: 4685bfcf732260f72fce58379e812e091557ef1dfc1bc8084226c7891dd6028f # v1.27.4
-             capm3_release_branch: main
-             bmo_release_branch: main
-             capm3_target_branch: main
-         - 1-28-1-29:
-             k8s_version_upgrade_from: v1.28.1
-             k8s_version_upgrade_to: v1.29.0
-             kubectl_sha256: 0e03ab096163f61ab610b33f37f55709d3af8e16e4dcc1eb682882ef80f96fd5 # v1.29.0
-             capm3_release_branch: release-1.6
-             bmo_release_branch: release-0.5
-             capm3_target_branch: release-1-6
-         - 1-26-1-27:
-             k8s_version_upgrade_from: v1.26.4
-             k8s_version_upgrade_to: v1.27.4
-             kubectl_sha256: 4685bfcf732260f72fce58379e812e091557ef1dfc1bc8084226c7891dd6028f # v1.27.4
-             capm3_release_branch: release-1.5
-             bmo_release_branch: release-0.4
-             capm3_target_branch: release-1-5
-         - 1-26-1-27:
-             k8s_version_upgrade_from: v1.26.4
-             kubectl_sha256: 636ac0eaa467dbceda4b2c4e33662adc9709f5ce40341c9fc1a687fc276ac02d # v1.26.4
-             k8s_version_upgrade_to: v1.27.4
-             capm3_release_branch: release-1.4
-             bmo_release_branch: release-0.3
-             capm3_target_branch: release-1-4
-         exclude:
-         - image_os: centos
- 
  - project:
      name: "capm3-periodic-tests"
      repo:
@@@ -937,20 -423,6 +423,6 @@@
      - capm3_periodic_e2e_ephemeral_tests:
          exclude:
          - image_os: ubuntu
-     - capm3_periodic_e2e_integration_tests:
-         capm3_target_branch:
-         - main:
-             capi_version: v1beta1
-             capm3_version: v1beta1
-             capm3_release_branch: main
-             bmo_release_branch: main
-             schedule: "H 4 * * *"
-         - release-1-6:
-             capi_version: v1beta1
-             capm3_version: v1beta1
-             capm3_release_branch: release-1.6
-             bmo_release_branch: release-0.5
-             schedule: "30 4 * * *"
  
  - project:
      name: 'ironic_image_build_tests'
@@@ -1008,6 -480,74 +480,6 @@@
      ci_ghprb_auth_id: '86c49704-5474-4524-97b7-805323b2c39a'
      ci_github_repo: 'https://github.com/Nordix/metal3-dev-tools.git'
  
 -- project:
 -    name: dev-env-integration-tests
 -    org: metal3-io
 -    proj:
 -    - metal3_dev_env:
 -        repo: metal3-dev-env
 -    - project_infra:
 -        repo: project-infra
 -        branch: '${{ghprbActualCommit}}'
 -        ci_github_repo: '${{ghprbAuthorRepoGitUrl}}'
 -    - capm3:
 -        repo: cluster-api-provider-metal3
 -    - bmo:
 -        repo: baremetal-operator
 -    - ipam:
 -        repo: ip-address-manager
 -    - ironic_image:
 -        repo: ironic-image
 -        name_postfix: '_ironic_from_source'
 -        trigger_postfix: '-ironic-source'
 -        ironic_install_type: 'source'
 -    - ironic_ipa_downloader:
 -        repo: ironic-ipa-downloader
 -    - mariadb_image:
 -        repo: mariadb-image
 -        build_mariadb_image_locally: 'true'
 -        ironic_use_mariadb: 'true'
 -    image_os:
 -    - ubuntu
 -    - centos
 -    capm3_target_branch:
 -    - main:
 -        capi_version: v1beta1
 -        capm3_version: v1beta1
 -        capm3_release_branch: main
 -        bmo_release_branch: main
 -        target_branches:
 -        - 'main'
 -    - release-1-6:
 -        capi_version: v1beta1
 -        capm3_version: v1beta1
 -        capm3_release_branch: release-1.6
 -        bmo_release_branch: release-0.5
 -        target_branches:
 -        - 'main'
 -        - 'release-1.6'
 -        - 'release-0.5'
 -    - release-1-5:
 -        capi_version: v1beta1
 -        capm3_version: v1beta1
 -        capm3_release_branch: release-1.5
 -        bmo_release_branch: release-0.4
 -        target_branches:
 -        - 'main'
 -        - 'release-1.5'
 -        - 'release-0.4'
 -    - release-1-4:
 -        capi_version: v1beta1
 -        capm3_version: v1beta1
 -        capm3_release_branch: release-1.4
 -        bmo_release_branch: release-0.3
 -        target_branches:
 -        - 'main'
 -        - 'release-1.4'
 -        - 'release-0.3'
 -    jobs:
 -    - dev_env_integration_tests
 -
  - project:
      name: dev-env-integration-tests-prow
      org: metal3-io