Merge "Bump k8s to v1.28.1. Also bump crictl, crio and kind node image to v1.28.0. For main branch k8s upgrade tests we add v1.27.x to v1.28.x test and remove the v1.24.x-1.25.x test."
diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml
index 723fdbb..a1ffea8 100644
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -90,6 +90,13 @@
capm3_release_branch: main
target_branches:
- 'main'
+ - release-1-5:
+ capi_version: v1beta1
+ capm3_version: v1beta1
+ capm3_release_branch: release-1.5
+ target_branches:
+ - 'main'
+ - 'release-1.5'
- release-1-4:
capi_version: v1beta1
capm3_version: v1beta1
@@ -104,13 +111,6 @@
target_branches:
- 'main'
- 'release-1.3'
- - release-1-2:
- capi_version: v1beta1
- capm3_version: v1beta1
- capm3_release_branch: release-1.2
- target_branches:
- - 'main'
- - 'release-1.2'
jobs:
- integration_tests
@@ -142,6 +142,13 @@
capm3_release_branch: main
target_branches:
- 'main'
+ - release-1-5:
+ capi_version: v1beta1
+ capm3_version: v1beta1
+ capm3_release_branch: release-1.5
+ target_branches:
+ - 'main'
+ - 'release-1.5'
- release-1-4:
capi_version: v1beta1
capm3_version: v1beta1
@@ -156,13 +163,6 @@
target_branches:
- 'main'
- 'release-1.3'
- - release-1-2:
- capi_version: v1beta1
- capm3_version: v1beta1
- capm3_release_branch: release-1.2
- target_branches:
- - 'main'
- - 'release-1.2'
jobs:
- keep_integration_tests
@@ -181,6 +181,11 @@
capm3_version: v1beta1
capm3_release_branch: main
schedule: "H 4 * * *"
+ - release-1-5:
+ capi_version: v1beta1
+ capm3_version: v1beta1
+ capm3_release_branch: release-1.5
+ schedule: "30 4 * * *"
- release-1-4:
capi_version: v1beta1
capm3_version: v1beta1
@@ -191,11 +196,6 @@
capm3_version: v1beta1
capm3_release_branch: release-1.3
schedule: "30 4 * * *"
- - release-1-2:
- capi_version: v1beta1
- capm3_version: v1beta1
- capm3_release_branch: release-1.2
- schedule: "30 4 * * *"
- project:
name: bml-tests
@@ -244,12 +244,12 @@
jobs:
- capm3_e2e_clusterctl_upgrade_tests:
upgrade_from_release:
+ - 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-1-2:
- upgrade_from: v1.2.
- from-release-0-5:
upgrade_from: v0.5.
exclude:
@@ -280,6 +280,13 @@
- 1-26-1-27:
k8s_version_upgrade_from: v1.26.4
k8s_version_upgrade_to: v1.27.4
+ capm3_release_branch: release-1.5
+ capm3_target_branch: release-1-5
+ target_branches:
+ - 'release-1.5'
+ - 1-26-1-27:
+ k8s_version_upgrade_from: v1.26.4
+ k8s_version_upgrade_to: v1.27.4
capm3_release_branch: release-1.4
capm3_target_branch: release-1-4
target_branches:
@@ -291,13 +298,6 @@
capm3_target_branch: release-1-3
target_branches:
- 'release-1.3'
- - 1-25-1-26:
- k8s_version_upgrade_from: v1.25.5
- k8s_version_upgrade_to: v1.26.4
- capm3_release_branch: release-1.2
- capm3_target_branch: release-1-2
- target_branches:
- - 'release-1.2'
exclude:
- image_os: centos
- capm3_e2e_integration_tests:
@@ -308,13 +308,13 @@
capm3_release_branch: main
target_branches:
- 'main'
- - release-1-4:
+ - release-1-5:
capi_version: v1beta1
capm3_version: v1beta1
- capm3_release_branch: release-1.4
+ capm3_release_branch: release-1.5
target_branches:
- 'main'
- - 'release-1.4'
+ - 'release-1.5'
- capm3_e2e_basic_tests:
capm3_target_branch:
- main:
@@ -323,13 +323,13 @@
capm3_release_branch: main
target_branches:
- 'main'
- - release-1-4:
+ - release-1-5:
capi_version: v1beta1
capm3_version: v1beta1
- capm3_release_branch: release-1.4
+ capm3_release_branch: release-1.5
target_branches:
- 'main'
- - 'release-1.4'
+ - 'release-1.5'
- capm3_e2e_feature_tests:
capm3_target_branch:
- main:
@@ -338,6 +338,12 @@
capm3_release_branch: main
target_branches:
- 'main'
+ - release-1-5:
+ capi_version: v1beta1
+ capm3_version: v1beta1
+ capm3_release_branch: release-1.5
+ target_branches:
+ - 'release-1.5'
- release-1-4:
capi_version: v1beta1
capm3_version: v1beta1
@@ -350,12 +356,6 @@
capm3_release_branch: release-1.3
target_branches:
- 'release-1.3'
- - release-1-2:
- capi_version: v1beta1
- capm3_version: v1beta1
- capm3_release_branch: release-1.2
- target_branches:
- - 'release-1.2'
- keep_capm3_e2e_integration_tests:
capm3_target_branch:
- main:
@@ -364,13 +364,13 @@
capm3_release_branch: main
target_branches:
- 'main'
- - release-1-4:
+ - release-1-5:
capi_version: v1beta1
capm3_version: v1beta1
- capm3_release_branch: release-1.4
+ capm3_release_branch: release-1.5
target_branches:
- 'main'
- - 'release-1.4'
+ - 'release-1.5'
- keep_capm3_e2e_basic_tests:
capm3_target_branch:
- main:
@@ -379,13 +379,13 @@
capm3_release_branch: main
target_branches:
- 'main'
- - release-1-4:
+ - release-1-5:
capi_version: v1beta1
capm3_version: v1beta1
- capm3_release_branch: release-1.4
+ capm3_release_branch: release-1.5
target_branches:
- 'main'
- - 'release-1.4'
+ - 'release-1.5'
- keep_capm3_e2e_feature_tests:
capm3_target_branch:
- main:
@@ -394,6 +394,12 @@
capm3_release_branch: main
target_branches:
- 'main'
+ - release-1-5:
+ capi_version: v1beta1
+ capm3_version: v1beta1
+ capm3_release_branch: release-1.5
+ target_branches:
+ - 'release-1.5'
- release-1-4:
capi_version: v1beta1
capm3_version: v1beta1
@@ -406,20 +412,14 @@
capm3_release_branch: release-1.3
target_branches:
- 'release-1.3'
- - release-1-2:
- capi_version: v1beta1
- capm3_version: v1beta1
- capm3_release_branch: release-1.2
- target_branches:
- - 'release-1.2'
- keep_capm3_e2e_clusterctl_upgrade_tests:
upgrade_from_release:
+ - 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-1-2:
- upgrade_from: v1.2.
- from-release-0-5:
upgrade_from: v0.5.
exclude:
@@ -450,6 +450,13 @@
- 1-26-1-27:
k8s_version_upgrade_from: v1.26.4
k8s_version_upgrade_to: v1.27.4
+ capm3_release_branch: release-1.5
+ capm3_target_branch: release-1-5
+ target_branches:
+ - 'release-1.5'
+ - 1-26-1-27:
+ k8s_version_upgrade_from: v1.26.4
+ k8s_version_upgrade_to: v1.27.4
capm3_release_branch: release-1.4
capm3_target_branch: release-1-4
target_branches:
@@ -461,13 +468,6 @@
capm3_target_branch: release-1-3
target_branches:
- 'release-1.3'
- - 1-25-1-26:
- k8s_version_upgrade_from: v1.25.5
- k8s_version_upgrade_to: v1.26.4
- capm3_release_branch: release-1.2
- capm3_target_branch: release-1-2
- target_branches:
- - 'release-1.2'
exclude:
- image_os: centos
@@ -482,12 +482,12 @@
jobs:
- capm3_main_e2e_clusterctl_upgrade_tests:
upgrade_from_release:
+ - 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-1-2:
- upgrade_from: v1.2.
- from-release-0-5:
upgrade_from: v0.5.
exclude:
@@ -514,6 +514,11 @@
- 1-26-1-27:
k8s_version_upgrade_from: v1.26.4
k8s_version_upgrade_to: v1.27.4
+ capm3_release_branch: release-1.5
+ capm3_target_branch: release-1-5
+ - 1-26-1-27:
+ k8s_version_upgrade_from: v1.26.4
+ k8s_version_upgrade_to: v1.27.4
capm3_release_branch: release-1.4
capm3_target_branch: release-1-4
- 1-25-1-26:
@@ -521,11 +526,6 @@
k8s_version_upgrade_to: v1.26.4
capm3_release_branch: release-1.3
capm3_target_branch: release-1-3
- - 1-25-1-26:
- k8s_version_upgrade_from: v1.25.5
- k8s_version_upgrade_to: v1.26.4
- capm3_release_branch: release-1.2
- capm3_target_branch: release-1-2
exclude:
- image_os: centos
- capm3_main_e2e_ephemeral_tests:
@@ -538,10 +538,10 @@
capm3_version: v1beta1
capm3_release_branch: main
schedule: "H 4 * * *"
- - release-1-4:
+ - release-1-5:
capi_version: v1beta1
capm3_version: v1beta1
- capm3_release_branch: release-1.4
+ capm3_release_branch: release-1.5
schedule: "30 4 * * *"
- capm3_main_e2e_feature_tests:
capm3_target_branch:
@@ -551,6 +551,12 @@
capm3_branch: main
capm3_release_branch: main
schedule: "H 2 * * *"
+ - release-1-5:
+ capi_version: v1beta1
+ capm3_version: v1beta1
+ capm3_branch: release-1.5
+ capm3_release_branch: release-1.5
+ schedule: "H 11 * * *"
- release-1-4:
capi_version: v1beta1
capm3_version: v1beta1
@@ -563,12 +569,6 @@
capm3_branch: release-1.3
capm3_release_branch: release-1.3
schedule: "H 8 * * *"
- - release-1-2:
- capi_version: v1beta1
- capm3_version: v1beta1
- capm3_branch: release-1.2
- capm3_release_branch: release-1.2
- schedule: "H 11 * * *"
- project:
name: 'ironic_image_build_tests'
diff --git a/jjb/onap/global-templates-onap-java.yaml b/jjb/onap/global-templates-onap-java.yaml
index 3132f95..91c4a28 100644
--- a/jjb/onap/global-templates-onap-java.yaml
+++ b/jjb/onap/global-templates-onap-java.yaml
@@ -148,7 +148,6 @@
- job-template:
name: 'onap-{project-name}-performance-tests-plots'
disabled_job_var: false
- node: onap-ubuntu1804
builders:
- shell:
@@ -249,8 +248,9 @@
- shell:
!include-raw-escape: ./verify-jobs.sh
- post-build:
- - project: onap-cps-performance-tests-plots
+ publishers:
+ - trigger:
+ project: 'onap-cps-performance-tests-plots'
# csits for diferent projects are different so need to have special handling
- job-template: