Merge "Create plots of k6 test result"
authorAndrew Fenner <Andrew.Fenner@est.tech>
Thu, 6 Jun 2024 09:21:23 +0000 (09:21 +0000)
committerNordix Gerrit <gerrit@nordix.org>
Thu, 6 Jun 2024 09:21:23 +0000 (09:21 +0000)
jjb/metal3/job_bml_integration_tests.yml
jjb/metal3/job_bml_periodic_integration_tests.yml
jjb/metal3/job_docker_image_building.yml [deleted file]
jjb/metal3/projects.yml
jjb/onap/cps/k6-performance-tests-trigger.sh
jjb/onap/cps/prepare-performance-tests-data.sh

index 72c3c407d05ccafb5fb67b16028876b7227be947..24627af935e058920b9b025e7d853e98eb201010 100644 (file)
 
 - job-template:
     id: bml_integration_tests
-    name: '{job_prefix}_{proj}_bml_integration_tests_{image_os}'
-    description: "CAPM3 v1beta1 integration tests for {org}/{repo} on {image_os} in Bare Metal Lab."
+    name: '{job_prefix}-bml-integration-tests-{image_os}'
+    description: "CAPM3 v1beta1 integration tests on {image_os} in Bare Metal Lab."
     project-type: pipeline
     defaults: global
     disabled: False
     concurrent: True
     parameters:
+    # Parameters set by Prow
     - string:
-        name: PROJECT_REPO_ORG
-        default: '{org}'
+        name: BUILD_ID
+        description: 'Used by Prow when triggering jobs'
+    - string:
+        name: PROW_JOB_ID
+        description: 'Used by Prow when triggering jobs'
+    - string:
+        name: REPO_OWNER
+        default: 'metal3-io'
         description: 'Project github repo org name'
     - string:
-        name: PROJECT_REPO_NAME
-        default: '{repo}'
+        name: REPO_NAME
+        default: 'metal3-dev-env'
         description: 'Project github repo name'
     - string:
-        name: ghprbActualCommit
+        name: PULL_BASE_REF
         default: 'main'
-        description: 'CI Repo branch for triggering manual build'
+        description: 'Ref name of the base branch'
     - string:
-        name: ghprbAuthorRepoGitUrl
-        default: 'https://github.com/{org}/{repo}.git'
-        description: 'CI Repo URL for triggering manual build'
-    - string:
-        name: ghprbTargetBranch
+        name: PULL_PULL_SHA
         default: 'main'
-        description: 'Target branch of the PR'
+        description: 'Pull request head SHA'
+    - string:
+        name: PULL_NUMBER
+        description: 'Pull request number'
+    # End of Prow parameters
     - string:
         name: IMAGE_OS
         default: '{image_os}'
     - string:
         name: CAPI_VERSION
         default: 'v1beta1'
-        description: 'Cluster API version.'
+        description: 'Cluster API version. E.g. v1beta1.'
     - string:
         name: CAPM3_VERSION
         default: 'v1beta1'
-        description: 'Cluster API provider Metal3 version.'
+        description: 'Cluster API provider Metal3 version. E.g. v1beta1.'
     - string:
         name: TARGET_NODE_MEMORY
         default: 4096
@@ -81,7 +88,7 @@
     - string:
         name: NUM_NODES
         default: 2
-        description: 'Number of baremetal servers.'
+        description: 'Number of baremetal servers'
 
     properties:
     - build-discarder:
         num-to-keep: 300
         artifact-days-to-keep: -1
         artifact-num-to-keep: -1
-    - github:
-        url: https://github.com/{org}/{repo}
     - build-blocker:
         use-build-blocker: true
         blocking-jobs:
             - ".*_bml_integration_tests_centos"
         block-level: 'GLOBAL'
 
-    triggers:
-    - github-pull-request:
-        admin-list:
-          - '{ci_github_admin_user}'
-        org-list: "{ci_github_whitelist_org}"
-        cron: 'H/5 * * * *'
-        auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '.*?/test-integration-bml-{image_os}.*?'
-        skip-build-phrase: '/skip-test'
-        only-trigger-phrase: True
-        github-hooks: True
-        permit-all: False
-        auto-close-on-fail: False
-        allow-whitelist-orgs-as-admins: True
-        white-list-target-branches:
-          - 'master'
-          - 'main'
-        status-context: "test-integration-bml-{image_os}"
-        success-status: "Passed"
-        failure-status: "Failed"
-        error-status: "Error"
-        cancel-builds-on-update: True
     pipeline-scm:
       scm:
       - git:
index 667a326c520f3c025b14899415a16a38f5985a38..dd366020c6bc2989c6a9522d169ef6f39ea638f7 100644 (file)
 
 - job-template:
     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."
+    name: '{job_prefix}-periodic-bml-integration_tests-{image_os}'
+    description: "CAPM3 v1beta1 periodic integration tests on {image_os} in Bare Metal Lab."
     project-type: pipeline
     defaults: global
     disabled: False
     concurrent: True
     parameters:
+    # Parameters set by Prow
     - string:
-        name: PROJECT_REPO_ORG
-        default: '{org}'
+        name: BUILD_ID
+        description: 'Used by Prow when triggering jobs'
+    - string:
+        name: PROW_JOB_ID
+        description: 'Used by Prow when triggering jobs'
+    - string:
+        name: REPO_OWNER
+        default: 'metal3-io'
         description: 'Project github repo org name'
     - string:
-        name: PROJECT_REPO_NAME
-        default: '{repo}'
+        name: REPO_NAME
+        default: 'metal3-dev-env'
         description: 'Project github repo name'
     - string:
-        name: ghprbActualCommit
+        name: PULL_BASE_REF
         default: 'main'
-        description: 'CI Repo branch for triggering manual build'
+        description: 'Ref name of the base branch'
     - string:
-        name: ghprbAuthorRepoGitUrl
-        default: 'https://github.com/{org}/{repo}.git'
-        description: 'CI Repo URL for triggering manual build'
-    - string:
-        name: ghprbTargetBranch
+        name: PULL_PULL_SHA
         default: 'main'
-        description: 'Target branch of the PR'
+        description: 'Pull request head SHA'
+    - string:
+        name: PULL_NUMBER
+        description: 'Pull request number'
+    # End of Prow parameters
     - string:
         name: IMAGE_OS
         default: '{image_os}'
     - string:
         name: CAPI_VERSION
         default: 'v1beta1'
-        description: 'Cluster API version.'
+        description: 'Cluster API version. E.g. v1beta1.'
     - string:
         name: CAPM3_VERSION
         default: 'v1beta1'
-        description: 'Cluster API provider Metal3 version.'
+        description: 'Cluster API provider Metal3 version. E.g. v1beta1.'
     - string:
         name: TARGET_NODE_MEMORY
         default: 4096
@@ -81,7 +88,7 @@
     - string:
         name: NUM_NODES
         default: 2
-        description: 'Number of baremetal servers.'
+        description: 'Number of baremetal servers'
 
     properties:
     - build-discarder:
diff --git a/jjb/metal3/job_docker_image_building.yml b/jjb/metal3/job_docker_image_building.yml
deleted file mode 100644 (file)
index 2e5543d..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
----
-#
-# ============LICENSE_START=======================================================
-#  Copyright (C) 2019 Nordix Foundation.
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-# ============LICENSE_END=========================================================
-
-# Description:
-# ============
-# This file contains job template definition for Docker image building.
-# This job can be triggered manually or through a Github pull request. It creates a
-# pipeline job. The pipeline scripts are maintained in Nordix/metal3-dev-tools repository.
-
-- job-template:
-    id: docker_image_building
-    name: '{job_prefix}_docker_image_building'
-    description: "Docker image builder job."
-    project-type: pipeline
-    defaults: global
-    disabled: False
-    concurrent: True
-    parameters:
-    - string:
-        name: ghprbActualCommit
-        default: 'main'
-        description: 'CI Repo branch for triggering manual build'
-
-    properties:
-    - build-discarder:
-        days-to-keep: 30
-        num-to-keep: 300
-        artifact-days-to-keep: -1
-        artifact-num-to-keep: -1
-
-    triggers:
-    - timed: "@midnight"
-
-    pipeline-scm:
-      scm:
-      - git:
-          url: "{ci_github_repo}"
-          credentials-id: "{ci_github_jenkins_credentials_id}"
-          branches:
-            - '{branch|main}'
-          name: 'origin'
-          refspec: '+refs/heads/*:refs/remotes/origin/*'
-          wipe-workspace: True
-          honor-refspec: True
-          shallow-clone: False
-      script-path: 'ci/jobs/{id}.pipeline'
-      lightweight-checkout: False
index eab6bdd257533c9352cc248bd7646588cdbed610..1dda52333e40c5d022841a5ea305b05b9adbbdf0 100644 (file)
@@ -34,7 +34,6 @@
     ci_github_whitelist_org:
     - nordix-metal3
     jobs:
-    - docker_image_building
     - update_nordix_repos
     - periodic_fullstack_building
     - fullstack_building_test
     org: metal3-io
     image_os: centos
     jobs:
-    - bml_integration_tests:
-        proj:
-        - metal3_dev_env:
-            repo: metal3-dev-env
-        - project_infra:
-            repo: project-infra
-            branch: '${{ghprbActualCommit}}'
-            ci_github_repo: '${{ghprbAuthorRepoGitUrl}}'
-    - bml_periodic_integration_tests:
-        repo: metal3-dev-env
+    - bml_integration_tests
+    - bml_periodic_integration_tests
 
 - project:
     name: 'project_infra_cleanup'
             capm3_release_branch: main
             bmo_release_branch: main
             capm3_target_branch: main
-        - 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: main
-            bmo_release_branch: main
-            capm3_target_branch: main
-        - 1-27-1-28:
-            k8s_version_upgrade_from: v1.27.4
-            k8s_version_upgrade_to: v1.28.1
-            kubectl_sha256: e7a7d6f9d06fab38b4128785aa80f65c54f6675a0d2abef655259ddd852274e1 # v1.28.1
-            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
         - main:
             capm3_release_branch: main
             bmo_release_branch: main
-            schedule: "H 1 * * TUE,THU,SAT"
+            schedule: "H 1 * * 2,4,6"
         - release-1-7:
             capm3_release_branch: release-1.7
             bmo_release_branch: release-0.6
-            schedule: "H 1 * * MON"
+            schedule: "H 1 * * 1"
         - release-1-6:
             capm3_release_branch: release-1.6
             bmo_release_branch: release-0.5
-            schedule: "H 1 * * WED"
+            schedule: "H 1 * * 3"
         - release-1-5:
             capm3_release_branch: release-1.5
             bmo_release_branch: release-0.4
-            schedule: "H 1 * * FRI"
+            schedule: "H 1 * * 5"
         exclude:
         - image_os: centos
     - capm3_periodic_e2e_k8s_upgrade_tests_prow:
             capm3_release_branch: main
             bmo_release_branch: main
             capm3_target_branch: main
-            schedule: "H 4 * * MON"
-        - 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: main
-            bmo_release_branch: main
-            capm3_target_branch: main
-            schedule: "H 4 * * THU"
-        - 1-27-1-28:
-            k8s_version_upgrade_from: v1.27.4
-            k8s_version_upgrade_to: v1.28.1
-            kubectl_sha256: e7a7d6f9d06fab38b4128785aa80f65c54f6675a0d2abef655259ddd852274e1 # v1.28.1
-            capm3_release_branch: main
-            bmo_release_branch: main
-            capm3_target_branch: main
-            schedule: "H 4 * * FRI"
+            schedule: "H 4 * * 1"
         - 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
-            schedule: "H 4 * * TUE"
+            schedule: "H 4 * * 2"
         - 1-28-1-29:
             k8s_version_upgrade_from: v1.28.1
             k8s_version_upgrade_to: v1.29.0
             capm3_release_branch: release-1.6
             bmo_release_branch: release-0.5
             capm3_target_branch: release-1-6
-            schedule: "H 4 * * WED"
+            schedule: "H 4 * * 3"
         - 1-26-1-27:
             k8s_version_upgrade_from: v1.26.4
             k8s_version_upgrade_to: v1.27.4
             capm3_release_branch: release-1.5
             bmo_release_branch: release-0.4
             capm3_target_branch: release-1-5
-            schedule: "H 4 * * SAT"
+            schedule: "H 4 * * 6"
         exclude:
         - image_os: centos
     - capm3_periodic_e2e_ephemeral_tests:
index 6377aa96ca0eaa4fca54c6f174ccb759ddd0a56a..edff9fe223387149d21b1a90d78609c8c6828338 100755 (executable)
@@ -18,7 +18,7 @@
 set -o errexit  # Exit on most errors
 set -o nounset  # Disallow expansion of unset variables
 set -o pipefail # Use last non-zero exit code in a pipeline
-set -o xtrace   # Trace logging - disabled to avoid producing gigabytes of logs
+set -o xtrace   # Trace logging
 
 #############################################################################################################################
 ################################################ M A I N ####################################################################
@@ -45,8 +45,8 @@ mkdir "build-logs"
 git clone https://gerrit.nordix.org/onap/cps
 cd cps
 
-# Since the commit which includes k6 test has not been merged yet
-git fetch https://gerrit.nordix.org/onap/cps refs/changes/22/21022/10 && git checkout FETCH_HEAD
+# Build latest images
+mvn -B clean install -DskipTests -Dcheckstyle.skip
 
 working_directory=$(pwd)
 
index 276ea4735f929581686309f75cf5c191748f3fd3..34bcfdc41231477170578162923ab2e9c52100d3 100755 (executable)
@@ -150,7 +150,7 @@ set terminal pngcairo size 1500,600
 set output "${chartFileName}"
 set xlabel "Build"
 set ylabel "Percentage of limit %"
-set yrange [0 < * < 80 : 120 < *]
+set yrange [0 : 120 < *]
 set xtics rotate
 plot '$dataFile' using (column(0)):2:xtic(sprintf("%d", column(1))) with linespoints title "measured", \
      100 with lines linestyle 2 title "100% limit"