Merge "Fix trigger phrase dev_env_integration_tests job"
diff --git a/jjb/metal3/job_bml_main_integration_tests.yml b/jjb/metal3/job_bml_periodic_integration_tests.yml
similarity index 97%
rename from jjb/metal3/job_bml_main_integration_tests.yml
rename to jjb/metal3/job_bml_periodic_integration_tests.yml
index 121777c..667a326 100644
--- a/jjb/metal3/job_bml_main_integration_tests.yml
+++ b/jjb/metal3/job_bml_periodic_integration_tests.yml
@@ -26,8 +26,8 @@
# pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
- job-template:
- id: bml_main_integration_tests
- name: '{job_prefix}_daily_main_bml_integration_tests_{image_os}'
+ id: bml_periodic_integration_tests
+ name: '{job_prefix}_periodic_bml_integration_tests_{image_os}'
description: "CAPM3 v1beta1 main integration tests for {org}/{repo} on {image_os} in Bare Metal Lab."
project-type: pipeline
defaults: global
diff --git a/jjb/metal3/job_capm3_main_e2e_clusterctl_upgrade_tests_prow.yml b/jjb/metal3/job_capm3_periodic_e2e_clusterctl_upgrade_tests_prow.yml
similarity index 95%
rename from jjb/metal3/job_capm3_main_e2e_clusterctl_upgrade_tests_prow.yml
rename to jjb/metal3/job_capm3_periodic_e2e_clusterctl_upgrade_tests_prow.yml
index 801801e..e351b15 100644
--- a/jjb/metal3/job_capm3_main_e2e_clusterctl_upgrade_tests_prow.yml
+++ b/jjb/metal3/job_capm3_periodic_e2e_clusterctl_upgrade_tests_prow.yml
@@ -25,8 +25,8 @@
# pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
- job-template:
- id: capm3_main_e2e_clusterctl_upgrade_tests_prow
- name: '{job_prefix}-daily-e2e-clusterctl-upgrade-test-{capm3_target_branch}'
+ id: capm3_periodic_e2e_clusterctl_upgrade_tests_prow
+ name: '{job_prefix}-periodic-e2e-clusterctl-upgrade-test-{capm3_target_branch}'
description: "CAPM e2e clusterctl upgrade tests on ubuntu."
project-type: pipeline
defaults: global
@@ -62,7 +62,7 @@
# End of Prow parameters
- string:
name: IMAGE_OS
- default: '{image_os}'
+ default: "ubuntu"
description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos'
- string:
name: capm3_release_branch
diff --git a/jjb/metal3/job_capm3_main_e2e_ephemeral_tests.yml b/jjb/metal3/job_capm3_periodic_e2e_ephemeral_tests.yml
similarity index 97%
rename from jjb/metal3/job_capm3_main_e2e_ephemeral_tests.yml
rename to jjb/metal3/job_capm3_periodic_e2e_ephemeral_tests.yml
index bce4400..632883e 100644
--- a/jjb/metal3/job_capm3_main_e2e_ephemeral_tests.yml
+++ b/jjb/metal3/job_capm3_periodic_e2e_ephemeral_tests.yml
@@ -25,8 +25,8 @@
# pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
- job-template:
- id: capm3_main_e2e_ephemeral_tests
- name: '{job_prefix}_daily_main_e2e_ephemeral_test_{image_os}'
+ id: capm3_periodic_e2e_ephemeral_tests
+ name: '{job_prefix}_periodic_e2e_ephemeral_test_{image_os}'
description: "CAPM3 v1beta1 e2e tests in ephemeral cluster for {repo[org]}/{repo[name]} on centos."
project-type: pipeline
defaults: global
diff --git a/jjb/metal3/job_capm3_main_e2e_feature_tests _prow.yml b/jjb/metal3/job_capm3_periodic_e2e_feature_tests _prow.yml
similarity index 94%
rename from jjb/metal3/job_capm3_main_e2e_feature_tests _prow.yml
rename to jjb/metal3/job_capm3_periodic_e2e_feature_tests _prow.yml
index 22946c8..35ec772 100644
--- a/jjb/metal3/job_capm3_main_e2e_feature_tests _prow.yml
+++ b/jjb/metal3/job_capm3_periodic_e2e_feature_tests _prow.yml
@@ -25,8 +25,8 @@
# pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
- job-template:
- id: capm3_main_e2e_feature_tests_prow
- name: '{job_prefix}-daily-{image_os}-e2e-feature-test-{capm3_target_branch}'
+ id: capm3_periodic_e2e_feature_tests_prow
+ name: '{job_prefix}-periodic-{image_os}-e2e-feature-test-{capm3_target_branch}'
description: "CAPM3 {capm3_version} e2e tests on {image_os}."
project-type: pipeline
defaults: global
@@ -50,11 +50,11 @@
description: 'Project github repo name'
- string:
name: PULL_BASE_REF
- default: '{capm3_branch}'
+ default: '{capm3_release_branch}'
description: 'Ref name of the base branch'
- string:
name: PULL_PULL_SHA
- default: '{capm3_branch}'
+ default: '{capm3_release_branch}'
description: 'Pull request head SHA'
- string:
name: PULL_NUMBER
diff --git a/jjb/metal3/job_capm3_main_e2e_integration_tests.yml b/jjb/metal3/job_capm3_periodic_e2e_integration_tests.yml
similarity index 96%
rename from jjb/metal3/job_capm3_main_e2e_integration_tests.yml
rename to jjb/metal3/job_capm3_periodic_e2e_integration_tests.yml
index 2aff7ba..e6746d4 100644
--- a/jjb/metal3/job_capm3_main_e2e_integration_tests.yml
+++ b/jjb/metal3/job_capm3_periodic_e2e_integration_tests.yml
@@ -25,8 +25,8 @@
# pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
- job-template:
- id: capm3_main_e2e_integration_tests
- name: '{job_prefix}_daily_{capm3_target_branch}_e2e_integration_test_{image_os}'
+ id: capm3_periodic_e2e_integration_tests
+ name: '{job_prefix}_periodic_{capm3_target_branch}_e2e_integration_test_{image_os}'
description: "CAPM3 {capm3_version} e2e integration tests for {repo[org]}/{repo[name]} on {image_os}."
project-type: pipeline
defaults: global
diff --git a/jjb/metal3/job_capm3_main_e2e_integration_tests_prow.yml b/jjb/metal3/job_capm3_periodic_e2e_integration_tests_prow.yml
similarity index 96%
rename from jjb/metal3/job_capm3_main_e2e_integration_tests_prow.yml
rename to jjb/metal3/job_capm3_periodic_e2e_integration_tests_prow.yml
index ad834a5..d133633 100644
--- a/jjb/metal3/job_capm3_main_e2e_integration_tests_prow.yml
+++ b/jjb/metal3/job_capm3_periodic_e2e_integration_tests_prow.yml
@@ -25,8 +25,8 @@
# pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
- job-template:
- id: capm3_main_e2e_integration_tests_prow
- name: '{job_prefix}-daily-{image_os}-e2e-integration-test-{capm3_target_branch}'
+ id: capm3_periodic_e2e_integration_tests_prow
+ name: '{job_prefix}-periodic-{image_os}-e2e-integration-test-{capm3_target_branch}'
description: "CAPM3 {capm3_version} e2e integration tests on {image_os}."
project-type: pipeline
defaults: global
diff --git a/jjb/metal3/job_capm3_main_e2e_k8s_upgrade_tests_prow.yml b/jjb/metal3/job_capm3_periodic_e2e_k8s_upgrade_tests_prow.yml
similarity index 96%
rename from jjb/metal3/job_capm3_main_e2e_k8s_upgrade_tests_prow.yml
rename to jjb/metal3/job_capm3_periodic_e2e_k8s_upgrade_tests_prow.yml
index 8ab6e7a..02b2531 100644
--- a/jjb/metal3/job_capm3_main_e2e_k8s_upgrade_tests_prow.yml
+++ b/jjb/metal3/job_capm3_periodic_e2e_k8s_upgrade_tests_prow.yml
@@ -25,8 +25,8 @@
# pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
- job-template:
- id: capm3_main_e2e_k8s_upgrade_tests_prow
- name: '{job_prefix}-daily-e2e-{k8s_versions}-upgrade-{capm3_target_branch}'
+ id: capm3_periodic_e2e_k8s_upgrade_tests_prow
+ name: '{job_prefix}-periodic-e2e-{k8s_versions}-upgrade-{capm3_target_branch}'
description: "CAPM3 e2e k8s upgrade tests on ubuntu."
project-type: pipeline
defaults: global
diff --git a/jjb/metal3/job_capm3_main_integration_tests.yml b/jjb/metal3/job_capm3_periodic_integration_tests.yml
similarity index 96%
rename from jjb/metal3/job_capm3_main_integration_tests.yml
rename to jjb/metal3/job_capm3_periodic_integration_tests.yml
index b34f57f..b7f1ebe 100644
--- a/jjb/metal3/job_capm3_main_integration_tests.yml
+++ b/jjb/metal3/job_capm3_periodic_integration_tests.yml
@@ -25,8 +25,8 @@
# pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
- job-template:
- id: capm3_main_integration_tests
- name: '{job_prefix}_daily_{capm3_target_branch}_integration_test_{image_os}'
+ id: capm3_periodic_integration_tests
+ name: '{job_prefix}_periodic_{capm3_target_branch}_integration_test_{image_os}'
description: "CAPM3 {capm3_version} integration tests for {org}/{repo} on {image_os}."
project-type: pipeline
defaults: global
diff --git a/jjb/metal3/job_main_clean.yml b/jjb/metal3/job_periodic_clean.yml
similarity index 96%
rename from jjb/metal3/job_main_clean.yml
rename to jjb/metal3/job_periodic_clean.yml
index 2ad3fa4..4d17be3 100644
--- a/jjb/metal3/job_main_clean.yml
+++ b/jjb/metal3/job_periodic_clean.yml
@@ -26,8 +26,8 @@
# pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
- job-template:
- id: main_clean
- name: '{job_prefix}_daily_main_integration_tests_cleanup'
+ id: periodic_clean
+ name: '{job_prefix}_periodic_integration_tests_cleanup'
description: "CAPM3 integration tests cleanup"
project-type: pipeline
defaults: global
diff --git a/jjb/metal3/job_main_fullstack_building.yml b/jjb/metal3/job_periodic_fullstack_building.yml
similarity index 98%
rename from jjb/metal3/job_main_fullstack_building.yml
rename to jjb/metal3/job_periodic_fullstack_building.yml
index fbb3ecd..2ee904e 100644
--- a/jjb/metal3/job_main_fullstack_building.yml
+++ b/jjb/metal3/job_periodic_fullstack_building.yml
@@ -25,8 +25,8 @@
# The pipeline scripts are maintained in Nordix/metal3-dev-tools repository.
- job-template:
- id: main_fullstack_building
- name: '{job_prefix}_daily_main_fullstack_building'
+ id: periodic_fullstack_building
+ name: '{job_prefix}_daily_periodic_fullstack_building'
description: "Build and test a Metal3 cluster stack from source."
project-type: pipeline
defaults: global
diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml
index 5a20c73..c3993d0 100644
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -38,7 +38,7 @@
- openstack_node_image_building
- docker_image_building
- update_nordix_repos
- - main_fullstack_building
+ - periodic_fullstack_building
- fullstack_building_test
- metal3_dev_tools_integration_test:
image_os:
@@ -194,7 +194,7 @@
- ubuntu
- centos
jobs:
- - capm3_main_integration_tests:
+ - capm3_periodic_integration_tests:
capm3_target_branch:
- main:
capi_version: v1beta1
@@ -234,7 +234,7 @@
repo: project-infra
branch: '${{ghprbActualCommit}}'
ci_github_repo: '${{ghprbAuthorRepoGitUrl}}'
- - bml_main_integration_tests:
+ - bml_periodic_integration_tests:
repo: metal3-dev-env
- project:
@@ -244,7 +244,7 @@
name: "project-infra"
ci_github_pipeline: 'jenkins/jobs/integration_tests_clean.pipeline'
jobs:
- - main_clean
+ - periodic_clean
- project:
name: 'project_infra'
@@ -630,7 +630,7 @@
capm3_version: v1beta1
capm3_release_branch: release-1.4
bmo_release_branch: release-0.3
- - capm3_main_e2e_integration_tests_prow:
+ - capm3_periodic_e2e_integration_tests_prow:
capm3_target_branch:
- main:
capi_version: v1beta1
@@ -688,33 +688,29 @@
capm3_version: v1beta1
capm3_release_branch: release-1.4
bmo_release_branch: release-0.3
- - capm3_main_e2e_feature_tests_prow:
+ - capm3_periodic_e2e_feature_tests_prow:
capm3_target_branch:
- main:
capi_version: v1beta1
capm3_version: v1beta1
- capm3_branch: main
capm3_release_branch: main
bmo_release_branch: main
schedule: "H 2 * * *"
- release-1-6:
capi_version: v1beta1
capm3_version: v1beta1
- capm3_branch: release-1.6
capm3_release_branch: release-1.6
bmo_release_branch: release-0.5
schedule: "H 8 * * *"
- release-1-5:
capi_version: v1beta1
capm3_version: v1beta1
- capm3_branch: release-1.5
capm3_release_branch: release-1.5
bmo_release_branch: release-0.4
schedule: "H 11 * * *"
- release-1-4:
capi_version: v1beta1
capm3_version: v1beta1
- capm3_branch: release-1.4
capm3_release_branch: release-1.4
bmo_release_branch: release-0.3
schedule: "H 5 * * *"
@@ -802,7 +798,7 @@
capm3_target_branch: release-1-4
exclude:
- image_os: centos
- - capm3_main_e2e_clusterctl_upgrade_tests_prow:
+ - capm3_periodic_e2e_clusterctl_upgrade_tests_prow:
capm3_target_branch:
- main:
capm3_release_branch: main
@@ -818,7 +814,7 @@
bmo_release_branch: release-0.3
exclude:
- image_os: centos
- - capm3_main_e2e_k8s_upgrade_tests_prow:
+ - capm3_periodic_e2e_k8s_upgrade_tests_prow:
k8s_versions:
- 1-28-1-29:
k8s_version_upgrade_from: v1.28.1
@@ -928,7 +924,7 @@
- image_os: centos
- project:
- name: "capm3-main-tests"
+ name: "capm3-periodic-tests"
repo:
org: "metal3-io"
name: "cluster-api-provider-metal3"
@@ -936,10 +932,10 @@
- ubuntu
- centos
jobs:
- - capm3_main_e2e_ephemeral_tests:
+ - capm3_periodic_e2e_ephemeral_tests:
exclude:
- image_os: ubuntu
- - capm3_main_e2e_integration_tests:
+ - capm3_periodic_e2e_integration_tests:
capm3_target_branch:
- main:
capi_version: v1beta1
diff --git a/jjb/onap/cps/cps-performance-test-jobs.yaml b/jjb/onap/cps/cps-performance-test-jobs.yaml
index ecbdd3c..4486e94 100644
--- a/jjb/onap/cps/cps-performance-test-jobs.yaml
+++ b/jjb/onap/cps/cps-performance-test-jobs.yaml
@@ -1,7 +1,7 @@
---
#
# ============LICENSE_START=======================================================
-# Copyright (C) 2023 Nordix Foundation.
+# Copyright (C) 2023-2024 Nordix Foundation.
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
name: cps-performance-test
project: cps
project-name: cps
- timer: "15 2 * * *"
+ timer: "*/30 * * * *"
mvn_params: "-P include-performance"
stream: