Merge "Reduce running frequency of k8s upgrade tests. Also remove dev env integration tests for branches"
diff --git a/jjb/metal3/job_capm3_periodic_e2e_clusterctl_upgrade_tests_prow.yml b/jjb/metal3/job_capm3_periodic_e2e_clusterctl_upgrade_tests_prow.yml
index cf3fa94..ad874a1 100644
--- a/jjb/metal3/job_capm3_periodic_e2e_clusterctl_upgrade_tests_prow.yml
+++ b/jjb/metal3/job_capm3_periodic_e2e_clusterctl_upgrade_tests_prow.yml
@@ -101,7 +101,7 @@
artifact-num-to-keep: -1
triggers:
- - timed: "H 1 1-31/2 * *" # Runs on odd days 1 AM
+ - timed: '{schedule}'
pipeline-scm:
scm:
diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml
index 1f32ce4..88f7244 100644
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -322,15 +322,19 @@
- main:
capm3_release_branch: main
bmo_release_branch: main
+ schedule: "H 1 * * TUE,THU,SAT"
- release-1-7:
capm3_release_branch: release-1.7
bmo_release_branch: release-0.6
+ schedule: "H 1 * * MON"
- release-1-6:
capm3_release_branch: release-1.6
bmo_release_branch: release-0.5
+ schedule: "H 1 * * WED"
- release-1-5:
capm3_release_branch: release-1.5
bmo_release_branch: release-0.4
+ schedule: "H 1 * * FRI"
exclude:
- image_os: centos
- capm3_periodic_e2e_k8s_upgrade_tests_prow:
diff --git a/jjb/onap/cps/prepare-performance-tests-data.sh b/jjb/onap/cps/prepare-performance-tests-data.sh
index 3ccb5ed..276ea47 100755
--- a/jjb/onap/cps/prepare-performance-tests-data.sh
+++ b/jjb/onap/cps/prepare-performance-tests-data.sh
@@ -230,6 +230,20 @@
fi
fi
+# Limit the plots to last 100 builds for each test
+for cps_stable_test_name in "${cps_stable_test_names[@]}"; do
+ tail -n 100 "$cps_stable_test_name.txt" > file.tmp && mv file.tmp "$cps_stable_test_name.txt"
+done
+for ncmp_stable_test_name in "${ncmp_stable_test_names[@]}"; do
+ tail -n 100 "$ncmp_stable_test_name.txt" > file.tmp && mv file.tmp "$ncmp_stable_test_name.txt"
+done
+for cps_unstable_test_name in "${cps_unstable_test_names[@]}"; do
+ tail -n 100 "$cps_unstable_test_name.txt" > file.tmp && mv file.tmp "$cps_unstable_test_name.txt"
+done
+for ncmp_unstable_test_name in "${ncmp_unstable_test_names[@]}"; do
+ tail -n 100 "$ncmp_unstable_test_name.txt" > file.tmp && mv file.tmp "$ncmp_unstable_test_name.txt"
+done
+
# Plot image (graphs) files in png format
for cps_stable_test_name in "${cps_stable_test_names[@]}"; do
buildPlotImage "$cps_stable_test_name.txt" "$cps_stable_test_name.png"