Merge "Metal-dev-env integration tests to dynamic worker"
authorKashif Khan <kashif.khan@est.tech>
Wed, 13 Mar 2024 14:57:53 +0000 (14:57 +0000)
committerNordix Gerrit <gerrit@nordix.org>
Wed, 13 Mar 2024 14:57:53 +0000 (14:57 +0000)
jjb/metal3/defaults.yml
jjb/metal3/job_capm3_clusterctl_upgrade_tests.yml [new file with mode: 0644]
jjb/metal3/job_capm3_e2e_basic_tests.yml
jjb/metal3/job_ci_image_building.yml [new file with mode: 0644]
jjb/metal3/projects.yml
jjb/onap/global-templates-onap-java.yaml
jjb/oransc/global-templates-oran-java.yaml
jjb/oransc/ties/ties-verify-job.yaml [new file with mode: 0644]

index 6dc01231784e8955aee1c311d718e686a4a88bdb..f24c7f89cdb3a9728c257e01fa26631ba8a7e61c 100644 (file)
@@ -34,6 +34,7 @@
     ci_github_repo: 'https://github.com/metal3-io/project-infra.git'
     ci_github_pipeline: 'jenkins/jobs/integration_tests.pipeline'
     e2e_feature_test_parallel_pipeline: 'jenkins/jobs/parallel_e2e_features_test.pipeline'
+    e2e_feature_test_pipeline: 'jenkins/jobs/capm3-e2e-tests.pipeline'
     ci_github_jenkins_credentials_id: 'metal3-jenkins-github-username-token'
     dev_env_integration_test_pipeline: 'jenkins/jobs/dev_env_integration_tests.pipeline'
     # NOTE: auth-id is taken from Jenkins Global Configuration (NOT THE CREDENTIAL STORE!)
diff --git a/jjb/metal3/job_capm3_clusterctl_upgrade_tests.yml b/jjb/metal3/job_capm3_clusterctl_upgrade_tests.yml
new file mode 100644 (file)
index 0000000..8dc3fea
--- /dev/null
@@ -0,0 +1,123 @@
+---
+#
+# ============LICENSE_START=======================================================
+#  Copyright (C) 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.
+# 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 Cluster API Provider Metal3 (CAPM3) e2e clusterctl upgrade tests.
+# This job can be triggered manually or through a Github pull request. It creates a
+# pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
+
+- job-template:
+    id: capm3_clusterctl_upgrade_tests
+    name: '{job_prefix}_{proj}_{capm3_target_branch}_clusterctl_upgrade_test_{image_os}'
+    description: "CAPM3 e2e clusterctl upgrade tests for {org}/{repo} on {image_os}."
+    project-type: pipeline
+    defaults: global
+    disabled: False
+    concurrent: True
+    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}'
+        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
+        default: '{capm3_release_branch}'
+        description: 'The target branch of CAPM3 to be used for this test'
+    - string:
+        name: bmo_release_branch
+        default: '{bmo_release_branch}'
+        description: 'The target branch of BMO to be used for this test'
+    - string:
+        name: TARGET_NODE_MEMORY
+        default: 4096
+        description: 'RAM size of the target host.'
+    - string:
+        name: TESTS_FOR
+        default: "e2e_tests"
+        description: 'Tests using the e2e framework.'
+    - string:
+        name: GINKGO_FOCUS
+        default: "clusterctl-upgrade"
+        description: 'Select the e2e upgrade test'
+    properties:
+    - build-discarder:
+        days-to-keep: 30
+        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-upgrade-{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:
+          - 'main'
+        status-context: "test-e2e-upgrade-{capm3_target_branch}"
+        success-status: "Passed"
+        failure-status: "Failed"
+        error-status: "Error"
+        cancel-builds-on-update: True
+    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: "{e2e_feature_test_pipeline}"
+      lightweight-checkout: False
index a2071ef68ea57722c589c2bda0af3c485681c7be..ead55d191becd29e19b49a8f28e9f9a2c4e5d808 100644 (file)
@@ -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
         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
         name: PULL_PULL_SHA
         default: 'main'
         description: 'Pull request head SHA'
-    # 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'
+        name: PULL_NUMBER
+        description: 'Pull request number'
+    # End of Prow parameters
     - string:
         name: IMAGE_OS
         default: '{image_os}'
         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:
           wipe-workspace: True
           honor-refspec: True
           shallow-clone: False
-      script-path: "{ci_github_pipeline}"
+      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/job_ci_image_building.yml b/jjb/metal3/job_ci_image_building.yml
new file mode 100644 (file)
index 0000000..1512313
--- /dev/null
@@ -0,0 +1,56 @@
+---
+#
+# ============LICENSE_START=======================================================
+#  Copyright (C) 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.
+# 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 ci image building tests.
+# This job can be triggered manually. It creates a
+# pipeline job. The pipeline scripts are maintained in metal3-io/project-infra repository.
+
+- job-template:
+    id: ci_image_building
+    name: '{job_prefix}_ci_image_building'
+    description: "Builder job for CI images for Metal3 CI"
+    project-type: pipeline
+    defaults: global
+    disabled: False
+    concurrent: True
+
+    properties:
+    - build-discarder:
+        days-to-keep: 30
+        num-to-keep: 300
+        artifact-days-to-keep: -1
+        artifact-num-to-keep: -1
+
+    pipeline-scm:
+      scm:
+      - git:
+          url: "{ci_github_repo}"
+          credentials-id: "{ci_github_jenkins_credentials_id}"
+          branches:
+            - 'main'
+          name: 'origin'
+          refspec: '+refs/heads/*:refs/remotes/origin/*'
+          wipe-workspace: True
+          honor-refspec: True
+          shallow-clone: False
+      script-path: 'jenkins/jobs/{id}.pipeline'
+      lightweight-checkout: False
index 8ddf5f19765893c66d0fa9394500cf8155c32103..88d93d97809c81020768046dfba0bc7149d9be78 100644 (file)
     ci_ghprb_auth_id: '86c49704-5474-4524-97b7-805323b2c39a'
     ci_github_repo: 'https://github.com/Nordix/metal3-dev-tools.git'
 
+- project:
+    name: 'image_building'
+    jobs:
+    - ci_image_building
+
 - project:
     name: integration-tests
     org: metal3-io
             - 'main'
             - 'release-1.4'
             - 'release-0.3'
-    - capm3_e2e_basic_tests:
+    - capm3_e2e_feature_tests:
         capm3_target_branch:
         - main:
             capi_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:
+        - release-1-5:
+            capi_version: v1beta1
+            capm3_version: v1beta1
+            capm3_release_branch: release-1.5
+            bmo_release_branch: release-0.4
+            target_branches:
+            - 'release-1.5'
+            - 'release-0.4'
+        - release-1-4:
+            capi_version: v1beta1
+            capm3_version: v1beta1
+            capm3_release_branch: release-1.4
+            bmo_release_branch: release-0.3
+            target_branches:
+            - 'release-1.4'
+            - 'release-0.3'
+    - capm3_clusterctl_upgrade_tests:
         capm3_target_branch:
         - main:
             capi_version: v1beta1
index 6767a978bafd5b24f2b586a8560840b052c6138f..da068a144a64b9e65d2cdc81bf65383ec01478b5 100644 (file)
 - job-template:
     name: 'onap-{project-name}-performance-tests-plots'
     disabled_job_var: false
+    node: xerces-cps-hw
 
     triggers:
       - timed: '{timer}'
 - 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
           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
index 97d45d63a5227cb2173f935861a69f9e067e6c83..0a21b6bb885b30799327b8cac4e6bd401712190b 100644 (file)
     builders:
       - shell:
           !include-raw-escape: ./verify-jobs.sh
+
+
+- job-template:
+    name: 'ties-{project-name}-verify-java'
+    node: oransc-ubuntu2004
+    disabled: false
+    concurrent: true
+    subdirectory: 
+    trigger_branch_pattern: '**'
+    trigger_files_path_pattern: '**'
+
+    properties:
+      - logrotate
+
+    parameters:
+      - nordix-gerrit-parameters
+      - string:
+          name: PROJECT
+          default: '{project}'
+          description: JJB configured PROJECT parameter to identify a Nordix Gerrit project
+      - string:
+          name: JAVA_HOME
+          default: '/usr/lib/jvm/{jdk-version}-openjdk-amd64'
+          description: Java home
+      - string:
+          name: MVN_VERSION
+          default: 3.6.2
+          description: Maven version
+      - string:
+          name: MVN_URL
+          default: https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/${{MVN_VERSION}}/apache-maven-${{MVN_VERSION}}-bin.zip
+          description: URL to download Maven
+      - string:
+          name: MVN
+          default: $WORKSPACE/apache-maven-${{MVN_VERSION}}/bin/mvn
+          description: Path to mvn executable
+      - string:
+          name: GO_PATH
+          default: '/usr/local/go/bin'
+          description: Path to go executable
+      - string:
+          name: SUBDIRECTORY
+          default: '{subdirectory}'
+          description: Subdirectory of the project
+      
+    scm:
+      - git-scm-gerrit:
+          ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
+          branch: $GERRIT_BRANCH
+          refspec: $GERRIT_REFSPEC
+          wipe_workspace: true
+          clean_before: false
+
+    triggers:
+      - nordix-gerrit-trigger-patchset-created:
+          project: '{project}'
+          branch: '{trigger_branch_pattern}'
+          files: '{trigger_files_path_pattern}'
+
+    wrappers:
+      - build-timeout:
+          timeout: 45
+
+    builders:
+      - shell:
+          !include-raw-escape: ./verify-jobs.sh
diff --git a/jjb/oransc/ties/ties-verify-job.yaml b/jjb/oransc/ties/ties-verify-job.yaml
new file mode 100644 (file)
index 0000000..3df20b5
--- /dev/null
@@ -0,0 +1,30 @@
+---
+# ============LICENSE_START=======================================================
+#  Copyright (C) 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.
+# 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=========================================================
+
+# this job gets triggered when a change is proposed to
+# topology-exposure-inventory project on Nordix Gerrit.
+
+- project:
+    name: topology-exposure-inventory-verify
+    project: topology-exposure-inventory
+    project-name: topology-exposure-inventory
+    jdk-version: java-17
+
+    jobs:
+      - 'ties-{project-name}-verify-java'
\ No newline at end of file