Merge "adding clusterctl upgrade test"

diff --git a/jjb/metal3/job_capm3_e2e_basic_tests.yml b/jjb/metal3/job_capm3_e2e_basic_tests.yml
index b01423f136fc17a1af1d8afee4dc705b34bc9332..ead55d191becd29e19b49a8f28e9f9a2c4e5d808 100644 (file)
--- a/jjb/metal3/job_capm3_e2e_basic_tests.yml
+++ b/jjb/metal3/job_capm3_e2e_basic_tests.yml
@@ -26,8 +26,8 @@
 
 - job-template:
     id: capm3_e2e_basic_tests
-    name: '{job_prefix}-{proj}-{capm3_target_branch}-e2e-basic-test-{image_os}'
-    description: "CAPM3 {capm3_version} e2e basic integration tests for {org}/{repo} on {image_os}."
+    name: '{job_prefix}-{image_os}-e2e-basic-test-{capm3_target_branch}'
+    description: "CAPM3 {capm3_version} e2e basic integration tests on {image_os}."
     project-type: pipeline
     defaults: global
     disabled: False
@@ -42,11 +42,9 @@
         description: 'Used by Prow when triggering jobs'
     - string:
         name: REPO_OWNER
-        default: '{org}'
         description: 'Project github repo org name'
     - string:
         name: REPO_NAME
-        default: '{repo}'
         description: 'Project github repo name'
     - string:
         name: PULL_BASE_REF
@@ -60,26 +58,6 @@
         name: PULL_NUMBER
         description: 'Pull request number'
     # End of Prow parameters
-    - string:
-        name: PROJECT_REPO_ORG
-        default: '{org}'
-        description: 'Project github repo org name'
-    - string:
-        name: PROJECT_REPO_NAME
-        default: '{repo}'
-        description: 'Project github repo name'
-    - string:
-        name: ghprbActualCommit
-        default: 'main'
-        description: 'CI Repo branch for triggering manual build'
-    - string:
-        name: ghprbAuthorRepoGitUrl
-        default: 'https://github.com/{org}/{repo}.git'
-        description: 'CI Repo URL for triggering manual build'
-    - string:
-        name: ghprbTargetBranch
-        default: 'main'
-        description: 'Target branch of the PR'
     - string:
         name: IMAGE_OS
         default: '{image_os}'
@@ -119,36 +97,16 @@
         num-to-keep: 300
         artifact-days-to-keep: -1
         artifact-num-to-keep: -1
-    - github:
-        url: https://github.com/{org}/{repo}
 
-    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-{image_os}-e2e-basic-{capm3_target_branch}.*?'
-        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: "{target_branches}"
-        status-context: "test-{image_os}-e2e-basic-{capm3_target_branch}"
-        success-status: "Passed"
-        failure-status: "Failed"
-        error-status: "Error"
-        cancel-builds-on-update: True
+    triggers: []
+
     pipeline-scm:
       scm:
       - git:
-          url: "https://github.com/Nordix/metal3-project-infra.git"
+          url: "{ci_github_repo}"
           credentials-id: "{ci_github_jenkins_credentials_id}"
           branches:
-            - 'fetch-changes-from-pr-id/mboukhalfa'
+            - '{branch|main}'
           name: 'origin'
           refspec: '+refs/heads/*:refs/remotes/origin/*'
           wipe-workspace: True
@@ -156,3 +114,28 @@
           shallow-clone: False
       script-path: "jenkins/jobs/prow_integration_tests.pipeline"
       lightweight-checkout: False
+
+- project:
+    name: "capm3-basic"
+    image_os:
+    - ubuntu
+    - centos
+    jobs:
+    - capm3_e2e_basic_tests:
+        capm3_target_branch:
+        - main:
+            capi_version: v1beta1
+            capm3_version: v1beta1
+            capm3_release_branch: main
+            bmo_release_branch: main
+            target_branches:
+            - 'main'
+        - release-1-6:
+            capi_version: v1beta1
+            capm3_version: v1beta1
+            capm3_release_branch: release-1.6
+            bmo_release_branch: release-0.5
+            target_branches:
+            - 'main'
+            - 'release-1.6'
+            - 'release-0.5'

diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml
index 48dea4e5b195a927144ff10f4e6f0c98acc6f0fe..ee894c26063f451f35ce378eb0ad506736239cc6 100644 (file)
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -385,24 +385,6 @@
             - 'main'
             - 'release-1.4'
             - 'release-0.3'
-    - capm3_e2e_basic_tests:
-        capm3_target_branch:
-        - main:
-            capi_version: v1beta1
-            capm3_version: v1beta1
-            capm3_release_branch: main
-            bmo_release_branch: main
-            target_branches:
-            - 'main'
-        - release-1-6:
-            capi_version: v1beta1
-            capm3_version: v1beta1
-            capm3_release_branch: release-1.6
-            bmo_release_branch: release-0.5
-            target_branches:
-            - 'main'
-            - 'release-1.6'
-            - 'release-0.5'
     - capm3_e2e_feature_tests:
         capm3_target_branch:
         - main:

diff --git a/jjb/onap/global-templates-onap-java.yaml b/jjb/onap/global-templates-onap-java.yaml
index 6767a978bafd5b24f2b586a8560840b052c6138f..da068a144a64b9e65d2cdc81bf65383ec01478b5 100644 (file)
--- a/jjb/onap/global-templates-onap-java.yaml
+++ b/jjb/onap/global-templates-onap-java.yaml
@@ -148,6 +148,7 @@
 - job-template:
     name: 'onap-{project-name}-performance-tests-plots'
     disabled_job_var: false
+    node: xerces-cps-hw
 
     triggers:
       - timed: '{timer}'
@@ -165,7 +166,7 @@
 - job-template:
     name: 'onap-{project-name}-{stream}-performance-test-java'
     disabled_job_var: false
-    node: onap-ubuntu1804
+    node: xerces-cps-hw
 
     disabled: '{obj:disabled_job_var}'
     concurrent: true
@@ -209,6 +210,7 @@
           name: SUBDIRECTORY
           default: '{subdirectory}'
           description: Subdirectory of the workspace for which the pom.xml will be called. This allows the verify to be called against a specific directory
+
     scm:
       - git-scm:
           ssh-credentials-id: nordixinfra-nordix-gerrit-ssh