diff --git a/jenkins/README.md b/jenkins/README.md index cf756da9..be515210 100644 --- a/jenkins/README.md +++ b/jenkins/README.md @@ -27,6 +27,10 @@ the commands below. The job result will be posted as a comment. v1beta1 and branch main on Ubuntu * **/test-centos-integration-main** run integration tests with CAPM3 API version v1beta1 and branch main on CentOS +* **/test-ubuntu-integration-release-1-6** run integration tests with CAPM3 API + version v1beta1 and branch release-1.6 on Ubuntu +* **/test-centos-integration-release-1-6** run integration tests with CAPM3 API + version v1beta1 and branch release-1.6 on CentOS * **/test-ubuntu-integration-release-1-5** run integration tests with CAPM3 API version v1beta1 and branch release-1.5 on Ubuntu * **/test-centos-integration-release-1-5** run integration tests with CAPM3 API @@ -49,6 +53,10 @@ clean up and deletion operations, there are separate triggers phrases as below: API version v1beta1 and branch main on Ubuntu * **/keep-test-centos-integration-main** run keep integration tests with CAPM3 API version v1beta1 and branch main on CentOS +* **/keep-test-ubuntu-integration-release-1-6** run keep integration tests with + CAPM3 API version v1beta1 and branch release-1.6 on Ubuntu +* **/keep-test-centos-integration-release-1-6** run keep integration tests with + CAPM3 API version v1beta1 and branch release-1.6 on CentOS * **/keep-test-ubuntu-integration-release-1-5** run keep integration tests with CAPM3 API version v1beta1 and branch release-1.5 on Ubuntu * **/keep-test-centos-integration-release-1-5** run keep integration tests with diff --git a/prow/manifests/overlays/metal3/config.yaml b/prow/manifests/overlays/metal3/config.yaml index cdb79f99..08bd7155 100644 --- a/prow/manifests/overlays/metal3/config.yaml +++ b/prow/manifests/overlays/metal3/config.yaml @@ -157,6 +157,9 @@ branch-protection: release-1.5: required_status_checks: contexts: ["test-ubuntu-e2e-integration-release-1-5"] + release-1.6: + required_status_checks: + contexts: ["test-ubuntu-e2e-integration-release-1-6"] ironic-image: branches: main: @@ -196,6 +199,9 @@ branch-protection: release-1.5: required_status_checks: contexts: ["test-ubuntu-e2e-integration-release-1-5"] + release-1.6: + required_status_checks: + contexts: ["test-ubuntu-e2e-integration-release-1-6"] mariadb-image: branches: main: @@ -208,7 +214,7 @@ branch-protection: contexts: [ "test-ubuntu-e2e-integration-main", - "test-centos-integration-release-1-5", + "test-centos-integration-release-1-6", ] deck: @@ -536,6 +542,7 @@ presubmits: branches: - main - release-1.5 + - release-1.6 skip_if_only_changed: '(((^|/)OWNERS)|(\.md))$' decorate: true spec: @@ -570,6 +577,7 @@ presubmits: branches: - main - release-1.5 + - release-1.6 skip_if_only_changed: '(((^|/)OWNERS)|(\.md))$' decorate: true spec: @@ -621,6 +629,7 @@ presubmits: branches: - main - release-1.5 + - release-1.6 run_if_changed: '^(Makefile|hack/.*)$' decorate: true spec: @@ -652,6 +661,7 @@ presubmits: branches: - main - release-1.5 + - release-1.6 skip_if_only_changed: '(((^|/)OWNERS)|(\.md))$' decorate: true spec: @@ -714,6 +724,7 @@ presubmits: branches: - main - release-1.5 + - release-1.6 skip_if_only_changed: '(((^|/)OWNERS)|(\.md))$' decorate: true spec: @@ -748,6 +759,7 @@ presubmits: branches: - main - release-1.5 + - release-1.6 skip_if_only_changed: '(((^|/)OWNERS)|(\.md))$' decorate: true spec: @@ -798,6 +810,7 @@ presubmits: branches: - main - release-1.5 + - release-1.6 run_if_changed: '^api|^test|^Makefile$' decorate: true spec: @@ -957,6 +970,7 @@ presubmits: branches: - main - release-1.5 + - release-1.6 skip_if_only_changed: '(((^|/)OWNERS)|(\.md))$' decorate: true spec: @@ -1008,6 +1022,7 @@ presubmits: branches: - main - release-1.5 + - release-1.6 run_if_changed: '^(Makefile|hack/.*)$' decorate: true spec: @@ -1022,6 +1037,7 @@ presubmits: branches: - main - release-1.5 + - release-1.6 skip_if_only_changed: '(((^|/)OWNERS)|(\.md))$' decorate: true spec: @@ -1073,6 +1089,7 @@ presubmits: branches: - main - release-1.5 + - release-1.6 skip_if_only_changed: '(((^|/)OWNERS)|(\.md))$' decorate: true spec: @@ -1135,6 +1152,7 @@ presubmits: branches: - main - release-1.5 + - release-1.6 skip_if_only_changed: '(((^|/)OWNERS)|(\.md))$' decorate: true spec: @@ -1167,6 +1185,7 @@ presubmits: branches: - main - release-1.5 + - release-1.6 skip_if_only_changed: '(((^|/)OWNERS)|(\.md))$' decorate: true spec: