Merge "Update cleanup job"
diff --git a/jjb/metal3/job_capm3_e2e_basic_tests.yml b/jjb/metal3/job_capm3_e2e_basic_tests.yml
index eb21a4c..5bf486c 100644
--- a/jjb/metal3/job_capm3_e2e_basic_tests.yml
+++ b/jjb/metal3/job_capm3_e2e_basic_tests.yml
@@ -1,4 +1,3 @@
----
#
# ============LICENSE_START=======================================================
# Copyright (C) 2022 Nordix Foundation.
@@ -106,7 +105,7 @@
url: "{ci_github_repo}"
credentials-id: "{ci_github_jenkins_credentials_id}"
branches:
- - '{branch|main}'
+ - '{branch|main}'
name: 'origin'
refspec: '+refs/heads/*:refs/remotes/origin/*'
wipe-workspace: True
@@ -130,6 +129,15 @@
bmo_release_branch: main
target_branches:
- 'main'
+ - release-1-8:
+ capi_version: v1beta1
+ capm3_version: v1beta1
+ capm3_release_branch: release-1.8
+ bmo_release_branch: release-0.8
+ target_branches:
+ - 'main'
+ - 'release-1.8'
+ - 'release-0.8'
- release-1-7:
capi_version: v1beta1
capm3_version: v1beta1
diff --git a/jjb/metal3/job_node_image_building.yml b/jjb/metal3/job_node_image_building.yml
index 35eba07..03b323d 100644
--- a/jjb/metal3/job_node_image_building.yml
+++ b/jjb/metal3/job_node_image_building.yml
@@ -38,15 +38,15 @@
description: 'Specifies the type of image being built in pipeline'
- string:
name: KUBERNETES_VERSION
- default: "v1.30.0"
+ default: "v1.31.0"
description: 'Kubernetes version'
- string:
name: CRICTL_VERSION
- default: "v1.30.0"
+ default: "v1.31.1"
description: 'CRICTL VERSION'
- string:
name: CRIO_VERSION
- default: "v1.29.3"
+ default: "v1.30.4"
description: 'CRI-O VERSION'
properties:
diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml
index 3933a1f..dc144ea 100644
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -25,9 +25,6 @@
# jobs associated with that github repository. The job definitions can be found
# in job_{job_id}.yml files in any of JJB include folders.
-# NOTE: kubectl_sha256 needs to match the kubernetes_version_upgrade_to version in 1.5/main
-# and it needs to match kubernetes_version_upgrade_from in 1.3/1.4
-
- project:
name: 'nordix_dev_tools'
branch: '${{ghprbActualCommit}}'
@@ -37,8 +34,8 @@
- update_nordix_repos
- artifact_cleanup
repo:
- org: "Nordix"
- name: "metal3-dev-tools"
+ org: "Nordix"
+ name: "metal3-dev-tools"
ci_github_jenkins_credentials_id: 'nordix-metal3-ci-github-prod-token'
ci_ghprb_auth_id: '86c49704-5474-4524-97b7-805323b2c39a'
ci_github_repo: 'https://github.com/Nordix/metal3-dev-tools.git'
@@ -66,8 +63,8 @@
- project:
name: 'project_infra'
repo:
- org: "metal3-io"
- name: "project-infra"
+ org: "metal3-io"
+ name: "project-infra"
jobs:
- fullstack_project-infra_building
- periodic_fullstack_building
@@ -85,6 +82,11 @@
capm3_version: v1beta1
capm3_release_branch: main
bmo_release_branch: main
+ - release-1-8:
+ capi_version: v1beta1
+ capm3_version: v1beta1
+ capm3_release_branch: release-1.8
+ bmo_release_branch: release-0.8
- release-1-7:
capi_version: v1beta1
capm3_version: v1beta1
@@ -95,11 +97,6 @@
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
- capm3_periodic_e2e_integration_tests_prow:
capm3_target_branch:
- main:
@@ -108,6 +105,12 @@
capm3_release_branch: main
bmo_release_branch: main
schedule: "H 1 * * *"
+ - release-1-8:
+ capi_version: v1beta1
+ capm3_version: v1beta1
+ capm3_release_branch: release-1.8
+ bmo_release_branch: release-0.8
+ schedule: "30 1 * * *"
- release-1-7:
capi_version: v1beta1
capm3_version: v1beta1
@@ -129,6 +132,27 @@
bmo_release_branch: main
capm3_target_branch: main
ginkgo_focus: pivoting
+ - release-1-8-pivoting:
+ capi_version: v1beta1
+ capm3_version: v1beta1
+ capm3_release_branch: release-1.8
+ bmo_release_branch: release-0.8
+ capm3_target_branch: release-1-8
+ ginkgo_focus: pivoting
+ - release-1-7-pivoting:
+ capi_version: v1beta1
+ capm3_version: v1beta1
+ capm3_release_branch: release-1.7
+ bmo_release_branch: release-0.6
+ capm3_target_branch: release-1-7
+ ginkgo_focus: pivoting
+ - release-1-6-pivoting:
+ capi_version: v1beta1
+ capm3_version: v1beta1
+ capm3_release_branch: release-1.6
+ bmo_release_branch: release-0.5
+ capm3_target_branch: release-1-6
+ ginkgo_focus: pivoting
- main-remediation:
capi_version: v1beta1
capm3_version: v1beta1
@@ -136,6 +160,27 @@
bmo_release_branch: main
capm3_target_branch: main
ginkgo_focus: remediation
+ - release-1-8-remediation:
+ capi_version: v1beta1
+ capm3_version: v1beta1
+ capm3_release_branch: release-1.8
+ bmo_release_branch: release-0.8
+ capm3_target_branch: release-1-8
+ ginkgo_focus: remediation
+ - release-1-7-remediation:
+ capi_version: v1beta1
+ capm3_version: v1beta1
+ capm3_release_branch: release-1.7
+ bmo_release_branch: release-0.6
+ capm3_target_branch: release-1-7
+ ginkgo_focus: remediation
+ - release-1-6-remediation:
+ capi_version: v1beta1
+ capm3_version: v1beta1
+ capm3_release_branch: release-1.6
+ bmo_release_branch: release-0.5
+ capm3_target_branch: release-1-6
+ ginkgo_focus: remediation
- main-features:
capi_version: v1beta1
capm3_version: v1beta1
@@ -143,20 +188,13 @@
bmo_release_branch: main
capm3_target_branch: main
ginkgo_focus: features
- - release-1-7-pivoting:
+ - release-1-8-features:
capi_version: v1beta1
capm3_version: v1beta1
- capm3_release_branch: release-1.7
- bmo_release_branch: release-0.6
- capm3_target_branch: release-1-7
- ginkgo_focus: pivoting
- - release-1-7-remediation:
- capi_version: v1beta1
- capm3_version: v1beta1
- capm3_release_branch: release-1.7
- bmo_release_branch: release-0.6
- capm3_target_branch: release-1-7
- ginkgo_focus: remediation
+ capm3_release_branch: release-1.8
+ bmo_release_branch: release-0.8
+ capm3_target_branch: release-1-8
+ ginkgo_focus: features
- release-1-7-features:
capi_version: v1beta1
capm3_version: v1beta1
@@ -164,20 +202,6 @@
bmo_release_branch: release-0.6
capm3_target_branch: release-1-7
ginkgo_focus: features
- - release-1-6-pivoting:
- capi_version: v1beta1
- capm3_version: v1beta1
- capm3_release_branch: release-1.6
- bmo_release_branch: release-0.5
- capm3_target_branch: release-1-6
- ginkgo_focus: pivoting
- - release-1-6-remediation:
- capi_version: v1beta1
- capm3_version: v1beta1
- capm3_release_branch: release-1.6
- bmo_release_branch: release-0.5
- capm3_target_branch: release-1-6
- ginkgo_focus: remediation
- release-1-6-features:
capi_version: v1beta1
capm3_version: v1beta1
@@ -185,27 +209,6 @@
bmo_release_branch: release-0.5
capm3_target_branch: release-1-6
ginkgo_focus: features
- - release-1-5-pivoting:
- capi_version: v1beta1
- capm3_version: v1beta1
- capm3_release_branch: release-1.5
- bmo_release_branch: release-0.4
- capm3_target_branch: release-1-5
- ginkgo_focus: pivoting
- - release-1-5-remediation:
- capi_version: v1beta1
- capm3_version: v1beta1
- capm3_release_branch: release-1.5
- bmo_release_branch: release-0.4
- capm3_target_branch: release-1-5
- ginkgo_focus: remediation
- - release-1-5-features:
- capi_version: v1beta1
- capm3_version: v1beta1
- capm3_release_branch: release-1.5
- bmo_release_branch: release-0.4
- capm3_target_branch: release-1-5
- ginkgo_focus: features
- capm3_periodic_e2e_feature_tests_prow:
capm3_target_job:
- main-pivoting:
@@ -216,22 +219,14 @@
capm3_target_branch: main
ginkgo_focus: pivoting
schedule: "H 19 2-30/2 * *" # Runs on even days 7 PM
- - main-remediation:
+ - release-1-8-pivoting:
capi_version: v1beta1
capm3_version: v1beta1
- capm3_release_branch: main
- bmo_release_branch: main
- capm3_target_branch: main
- ginkgo_focus: remediation
- schedule: "H 19 2-30/2 * *" # Runs on even days 7 PM
- - main-features:
- capi_version: v1beta1
- capm3_version: v1beta1
- capm3_release_branch: main
- bmo_release_branch: main
- capm3_target_branch: main
- ginkgo_focus: features
- schedule: "H 19 2-30/2 * *" # Runs on even days 7 PM
+ capm3_release_branch: release-1.8
+ bmo_release_branch: release-0.8
+ capm3_target_branch: release-1-8
+ ginkgo_focus: pivoting
+ schedule: "H 0 1-31/2 * *" # Runs on odd days 0 AM
- release-1-7-pivoting:
capi_version: v1beta1
capm3_version: v1beta1
@@ -240,22 +235,6 @@
capm3_target_branch: release-1-7
ginkgo_focus: pivoting
schedule: "H 19 1-31/2 * *" # Runs on odd days 7 PM
- - release-1-7-remediation:
- capi_version: v1beta1
- capm3_version: v1beta1
- capm3_release_branch: release-1.7
- bmo_release_branch: release-0.6
- capm3_target_branch: release-1-7
- ginkgo_focus: remediation
- schedule: "H 19 1-31/2 * *" # Runs on odd days 7 PM
- - release-1-7-features:
- capi_version: v1beta1
- capm3_version: v1beta1
- capm3_release_branch: release-1.7
- bmo_release_branch: release-0.6
- capm3_target_branch: release-1-7
- ginkgo_focus: features
- schedule: "H 19 1-31/2 * *" # Runs on odd days 7 PM
- release-1-6-pivoting:
capi_version: v1beta1
capm3_version: v1beta1
@@ -264,6 +243,30 @@
capm3_target_branch: release-1-6
ginkgo_focus: pivoting
schedule: "H 0 2-30/2 * *" # Runs on even days 0 AM
+ - main-remediation:
+ capi_version: v1beta1
+ capm3_version: v1beta1
+ capm3_release_branch: main
+ bmo_release_branch: main
+ capm3_target_branch: main
+ ginkgo_focus: remediation
+ schedule: "H 19 2-30/2 * *" # Runs on even days 7 PM
+ - release-1-8-remediation:
+ capi_version: v1beta1
+ capm3_version: v1beta1
+ capm3_release_branch: release-1.8
+ bmo_release_branch: release-0.8
+ capm3_target_branch: release-1-8
+ ginkgo_focus: remediation
+ schedule: "H 0 1-31/2 * *" # Runs on odd days 0 AM
+ - release-1-7-remediation:
+ capi_version: v1beta1
+ capm3_version: v1beta1
+ capm3_release_branch: release-1.7
+ bmo_release_branch: release-0.6
+ capm3_target_branch: release-1-7
+ ginkgo_focus: remediation
+ schedule: "H 19 1-31/2 * *" # Runs on odd days 7 PM
- release-1-6-remediation:
capi_version: v1beta1
capm3_version: v1beta1
@@ -272,6 +275,30 @@
capm3_target_branch: release-1-6
ginkgo_focus: remediation
schedule: "H 0 2-30/2 * *" # Runs on even days 0 AM
+ - main-features:
+ capi_version: v1beta1
+ capm3_version: v1beta1
+ capm3_release_branch: main
+ bmo_release_branch: main
+ capm3_target_branch: main
+ ginkgo_focus: features
+ schedule: "H 19 2-30/2 * *" # Runs on even days 7 PM
+ - release-1-8-features:
+ capi_version: v1beta1
+ capm3_version: v1beta1
+ capm3_release_branch: release-1.8
+ bmo_release_branch: release-0.8
+ capm3_target_branch: release-1-8
+ ginkgo_focus: features
+ schedule: "H 0 1-31/2 * *" # Runs on odd days 0 AM
+ - release-1-7-features:
+ capi_version: v1beta1
+ capm3_version: v1beta1
+ capm3_release_branch: release-1.7
+ bmo_release_branch: release-0.6
+ capm3_target_branch: release-1-7
+ ginkgo_focus: features
+ schedule: "H 19 1-31/2 * *" # Runs on odd days 7 PM
- release-1-6-features:
capi_version: v1beta1
capm3_version: v1beta1
@@ -280,30 +307,6 @@
capm3_target_branch: release-1-6
ginkgo_focus: features
schedule: "H 0 2-30/2 * *" # Runs on even days 0 AM
- - release-1-5-pivoting:
- capi_version: v1beta1
- capm3_version: v1beta1
- capm3_release_branch: release-1.5
- bmo_release_branch: release-0.4
- capm3_target_branch: release-1-5
- ginkgo_focus: pivoting
- schedule: "H 0 1-31/2 * *" # Runs on odd days 0 AM
- - release-1-5-remediation:
- capi_version: v1beta1
- capm3_version: v1beta1
- capm3_release_branch: release-1.5
- bmo_release_branch: release-0.4
- capm3_target_branch: release-1-5
- ginkgo_focus: remediation
- schedule: "H 0 1-31/2 * *" # Runs on odd days 0 AM
- - release-1-5-features:
- capi_version: v1beta1
- capm3_version: v1beta1
- capm3_release_branch: release-1.5
- bmo_release_branch: release-0.4
- capm3_target_branch: release-1-5
- ginkgo_focus: features
- schedule: "H 0 1-31/2 * *" # Runs on odd days 0 AM
exclude:
- image_os: ubuntu # This is to disable the tests running on ubuntu, to save resources
- capm3_e2e_clusterctl_upgrade_tests_prow:
@@ -311,6 +314,9 @@
- main:
capm3_release_branch: main
bmo_release_branch: main
+ - release-1-8:
+ capm3_release_branch: release-1.8
+ bmo_release_branch: release-0.8
- release-1-7:
capm3_release_branch: release-1.7
bmo_release_branch: release-0.6
@@ -324,31 +330,27 @@
- 1-29-1-30:
k8s_version_upgrade_from: v1.29.0
k8s_version_upgrade_to: v1.30.0
- kubectl_sha256: 7c3807c0f5c1b30110a2ff1e55da1d112a6d0096201f1beb81b269f582b5d1c5 # v1.30.0
capm3_release_branch: main
bmo_release_branch: main
capm3_target_branch: main
- 1-29-1-30:
k8s_version_upgrade_from: v1.29.0
k8s_version_upgrade_to: v1.30.0
- kubectl_sha256: 7c3807c0f5c1b30110a2ff1e55da1d112a6d0096201f1beb81b269f582b5d1c5 # v1.30.0
+ capm3_release_branch: release-1.8
+ bmo_release_branch: release-0.8
+ capm3_target_branch: release-1-8
+ - 1-29-1-30:
+ k8s_version_upgrade_from: v1.29.0
+ k8s_version_upgrade_to: v1.30.0
capm3_release_branch: release-1.7
bmo_release_branch: release-0.6
capm3_target_branch: release-1-7
- 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
exclude:
- image_os: centos
- capm3_periodic_e2e_clusterctl_upgrade_tests_prow:
@@ -357,6 +359,10 @@
capm3_release_branch: main
bmo_release_branch: main
schedule: "H 22 * * 1,3,5"
+ - release-1-8:
+ capm3_release_branch: release-1.8
+ bmo_release_branch: release-0.8
+ schedule: "H 22 * * 0"
- release-1-7:
capm3_release_branch: release-1.7
bmo_release_branch: release-0.6
@@ -372,7 +378,6 @@
- 1-29-1-30:
k8s_version_upgrade_from: v1.29.0
k8s_version_upgrade_to: v1.30.0
- kubectl_sha256: 7c3807c0f5c1b30110a2ff1e55da1d112a6d0096201f1beb81b269f582b5d1c5 # v1.30.0
capm3_release_branch: main
bmo_release_branch: main
capm3_target_branch: main
@@ -380,7 +385,13 @@
- 1-29-1-30:
k8s_version_upgrade_from: v1.29.0
k8s_version_upgrade_to: v1.30.0
- kubectl_sha256: 7c3807c0f5c1b30110a2ff1e55da1d112a6d0096201f1beb81b269f582b5d1c5 # v1.30.0
+ capm3_release_branch: release-1.8
+ bmo_release_branch: release-0.8
+ capm3_target_branch: release-1-8
+ schedule: "H 3 * * 4"
+ - 1-29-1-30:
+ k8s_version_upgrade_from: v1.29.0
+ k8s_version_upgrade_to: v1.30.0
capm3_release_branch: release-1.7
bmo_release_branch: release-0.6
capm3_target_branch: release-1-7
@@ -388,19 +399,10 @@
- 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
schedule: "H 3 * * 3"
- - 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
- schedule: "H 3 * * 6"
exclude:
- image_os: centos
- capm3_periodic_e2e_ephemeral_tests:
@@ -494,6 +496,15 @@
bmo_release_branch: main
target_branches:
- 'main'
+ - release-1-8:
+ capi_version: v1beta1
+ capm3_version: v1beta1
+ capm3_release_branch: release-1.8
+ bmo_release_branch: release-0.8
+ target_branches:
+ - 'main'
+ - 'release-1.8'
+ - 'release-0.8'
- release-1-7:
capi_version: v1beta1
capm3_version: v1beta1
@@ -512,15 +523,6 @@
- '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'
- dev_env_periodic_integration_tests_prow:
capm3_target_branch:
- main:
diff --git a/jjb/onap/ccsdk-oran/ccsdk-oran-verify-jobs.yaml b/jjb/onap/ccsdk-oran/ccsdk-oran-verify-jobs.yaml
index 6950be0..e920928 100644
--- a/jjb/onap/ccsdk-oran/ccsdk-oran-verify-jobs.yaml
+++ b/jjb/onap/ccsdk-oran/ccsdk-oran-verify-jobs.yaml
@@ -29,6 +29,18 @@
branch: '{stream}'
jdk-version: java-17
mvn_version: 3.8.3
+ - newdelhi:
+ branch: '{stream}'
+ jdk-version: java-17
+ mvn_version: 3.8.3
+ - montreal:
+ branch: '{stream}'
+ jdk-version: java-17
+ mvn_version: 3.8.3
+ - london:
+ branch: '{stream}'
+ jdk-version: java-17
+ mvn_version: 3.8.3
jobs:
- 'onap-{project-name}-{stream}-verify-java'
diff --git a/jjb/onap/cps/k6-performance-tests-trigger.sh b/jjb/onap/cps/k6-performance-tests-trigger.sh
index edff9fe..4caa4d6 100755
--- a/jjb/onap/cps/k6-performance-tests-trigger.sh
+++ b/jjb/onap/cps/k6-performance-tests-trigger.sh
@@ -20,38 +20,13 @@
set -o pipefail # Use last non-zero exit code in a pipeline
set -o xtrace # Trace logging
-#############################################################################################################################
-################################################ M A I N ####################################################################
-#############################################################################################################################
cd "$WORKSPACE"
-# Check if cps repository directory exists
-if [ -d "cps" ]; then
- # If it exists, wipe the directory
- echo "wiping the old cps repository..."
- rm -rf cps
-fi
-
-# Check if build-logs exists
-if [ -d "build-logs" ]; then
- # If it exists, wipe the directory
- echo "wiping the old build-logs directory..."
- rm -rf "build-logs"
-fi
-
-mkdir "build-logs"
-
-# Close the cps repository
+# Check out CPS source repo
+rm -rf cps
git clone https://gerrit.nordix.org/onap/cps
cd cps
-# Build latest images
-mvn -B clean install -DskipTests -Dcheckstyle.skip
-
-working_directory=$(pwd)
-
-# Provide execute permission to runner script
-chmod 777 "$working_directory/k6-tests/run-k6-tests.sh"
-
-# Run all k6 tests and save the logs
-"$working_directory/k6-tests/run-k6-tests.sh" 2>&1 | tee "$WORKSPACE/build-logs/k6-build.log"
+# Start the k6 test runner
+chmod 755 ./k6-tests/run-k6-tests.sh
+CLEAN_DOCKER_IMAGES=1 ./k6-tests/run-k6-tests.sh
diff --git a/jjb/onap/cps/prepare-k6-performance-tests-plots.sh b/jjb/onap/cps/prepare-k6-performance-tests-plots.sh
index 06a8eda..a2033c7 100755
--- a/jjb/onap/cps/prepare-k6-performance-tests-plots.sh
+++ b/jjb/onap/cps/prepare-k6-performance-tests-plots.sh
@@ -56,7 +56,7 @@
buildToRead=$1
consoleURL="${JENKINS_JOB_URL}/${buildToRead}/consoleText"
# Extract summary CSV from Jenkins console output
- curl -s "$consoleURL" | sed -n '/-- BEGIN CSV REPORT/, /-- END CSV REPORT/p' | grep "^[1-9].*,.*,.*,.*,.*$" || true
+ curl -s "$consoleURL" | sed -n '/-- BEGIN CSV REPORT/, /-- END CSV REPORT/p' | grep "^[0-9].*,.*,.*,.*,.*$" || true
}
# Get and record the latest k6-job-results with the build number for all tests
@@ -104,6 +104,8 @@
set xlabel "Build"
set ylabel "${units}"
set yrange [0 : ${y_max} < *]
+set style line 1 lc rgb '#d3d3d3' lt 1 lw 1 dashtype 2
+set grid ytics ls 1
set xtics rotate
plot '$dataFile' using 1:3:xtic(sprintf("%d", column(1))) with linespoints title "measured", \
'$dataFile' using 1:2 with lines linestyle 2 title "limit"