Merge "test basic e2e pipline from nordix branch"
authorKashif Khan <kashif.khan@est.tech>
Tue, 5 Mar 2024 08:34:27 +0000 (08:34 +0000)
committerNordix Gerrit <gerrit@nordix.org>
Tue, 5 Mar 2024 08:34:27 +0000 (08:34 +0000)
21 files changed:
jjb/metal3/job_bml_integration_tests.yml
jjb/metal3/job_capm3_e2e_basic_tests.yml
jjb/metal3/job_capm3_e2e_clusterctl_upgrade_tests.yml
jjb/metal3/job_capm3_e2e_feature_tests.yml
jjb/metal3/job_capm3_e2e_integration_tests.yml
jjb/metal3/job_capm3_e2e_k8s_upgrade_tests.yml
jjb/metal3/job_ci_image_building.yml [new file with mode: 0644]
jjb/metal3/job_fullstack_building_test.yml
jjb/metal3/job_fullstack_project-infra_building_test.yml
jjb/metal3/job_integration_tests.yml
jjb/metal3/job_ironic_image_build_test.yml
jjb/metal3/job_keep_capm3_e2e_basic_tests.yml
jjb/metal3/job_keep_capm3_e2e_clusterctl_upgrade_tests.yml
jjb/metal3/job_keep_capm3_e2e_feature_tests.yml
jjb/metal3/job_keep_capm3_e2e_integration_tests.yml
jjb/metal3/job_keep_capm3_e2e_k8s_upgrade_tests.yml
jjb/metal3/job_keep_integration_vm.yml
jjb/metal3/job_metal3_dev_tools_integration_test.yml
jjb/metal3/projects.yml
jjb/oransc/global-templates-oran-java.yaml
jjb/oransc/ties/ties-verify-job.yaml [new file with mode: 0644]

index 6ffeebea84a049bb56a281743dc23e9d20ebdf70..72c3c407d05ccafb5fb67b16028876b7227be947 100644 (file)
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/test-integration-bml-{image_os}(\s(.|\n)*)?'
+        trigger-phrase: '.*?/test-integration-bml-{image_os}.*?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True
index 8c70f910f2ccef9cc598a94859119ca9d1dac253..560eb96c751bce848aeb681eb1efeb9cfef8490b 100644 (file)
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/test-{image_os}-e2e-basic-{capm3_target_branch}(\s(.|\n)*)?'
+        trigger-phrase: '.*?/test-{image_os}-e2e-basic-{capm3_target_branch}.*?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True
index eb9a6fae86a90fdebbdcbc59edf08b68f582c2b2..7a4e7d0232d21d9c561636864bee2f8691d74dfe 100644 (file)
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/test-e2e-upgrade-main-{upgrade_from_release}(\s(.|\n)*)?'
+        trigger-phrase: '.*?/test-e2e-upgrade-main-{upgrade_from_release}.*?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True
index 362448fadc2d1ed73a0c0e269782ba3b4c11b6dd..d48e7f968bab8d212a03720b4aa359ecbca05f35 100644 (file)
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/test-{image_os}-e2e-feature-{capm3_target_branch}(\s(.|\n)*)?'
+        trigger-phrase: '.*?/test-{image_os}-e2e-feature-{capm3_target_branch}.*?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True
index 34c0983404acb5f95edb55255aa53f4ce9f5f6a8..995dbb49b7435a35dc46bd1a306aa4c65bbbd706 100644 (file)
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/test-{image_os}-e2e-integration-{capm3_target_branch}(\s(.|\n)*)?'
+        trigger-phrase: '.*?/test-{image_os}-e2e-integration-{capm3_target_branch}.*?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True
index 1198ef384121669521e34ec3268bcdbae661e324..c85d5b1ef1d4d7865957cc5fa8976beeeda325f9 100644 (file)
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '(\n|\A)\/test-e2e-{k8s_versions}-upgrade-{capm3_target_branch}\s*(\r|\n|\Z)'
+        trigger-phrase: '.*?/test-e2e-{k8s_versions}-upgrade-{capm3_target_branch}.*?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True
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 5956785e35dfe0f5ffaa7534a50346afeead3cae..918ce98d2a863fad08812d26df9460e84721596c 100644 (file)
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/test-metal3-fullstack(\s(.|\n)*)?'
+        trigger-phrase: '.*?/test-metal3-fullstack.*?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True
index b5aa3bc89ade1d21f417a40f5273a70fa6e26de1..118bf62e5d72cb5475aca5433fa85b74be1f39ee 100644 (file)
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/test-metal3-fullstack(\s(.|\n)*)?'
+        trigger-phrase: '.*?/test-metal3-fullstack.*?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True
index 15dae130dd98564053794eba2af3005f72f00806..030d4c45e215f424c9b7b7ae812e58477eda7ea3 100644 (file)
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/test-{image_os}-integration-{capm3_target_branch}{trigger_postfix}(\s(.|\n)*)?'
+        trigger-phrase: '.*?/test-{image_os}-integration-{capm3_target_branch}{trigger_postfix}.*?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True
index cbe2f2e2ac160d09753a88cc0f5f0512108120a2..8b9412f3e86141614490ead27edbe536e4ba4a3d 100644 (file)
@@ -73,7 +73,7 @@
           - '{ci_github_admin_user}'
         org-list: "{ci_github_whitelist_org}"
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/test-ironic-image-build(\s(.|\n)*)?'
+        trigger-phrase: '.*?/test-ironic-image-build.*?'
         cron: 'H/5 * * * *'
         only-trigger-phrase: True
         github-hooks: True
index e44b0c55859eee964c748721e2236737c832f481..5536dc1fb6f9d64ef0bb6acfc222fc0d7e31b171 100644 (file)
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/keep-test-{image_os}-e2e-basic-main(\s(.|\n)*)?'
+        trigger-phrase: '.*?/keep-test-{image_os}-e2e-basic-main.*?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True
index 93380983e88a244a652a91f78f80c439e6f64a2d..d54ec8c455ae8b5d77a375eff14b036260cf39be 100644 (file)
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/keep-test-e2e-upgrade-main-{upgrade_from_release}(\s(.|\n)*)?'
+        trigger-phrase: '.*?/keep-test-e2e-upgrade-main-{upgrade_from_release}.*?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True
index 8fa914ee1dc167348c75fc93143f02f0cc7371be..a68893cff60e014cdbc4f0bed2acb46c91b31d8b 100644 (file)
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/keep-test-{image_os}-e2e-feature-{capm3_target_branch}(\s(.|\n)*)?'
+        trigger-phrase: '.*?/keep-test-{image_os}-e2e-feature-{capm3_target_branch}.*?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True
index b88e68f9165b3ddb499824a57207d4d0b8628f6b..ddb9e7ccecefc4a2c3899d62e929196e812fcbd0 100644 (file)
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/keep-test-{image_os}-e2e-integration-main(\s(.|\n)*)?'
+        trigger-phrase: '.*?/keep-test-{image_os}-e2e-integration-main.*?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True
index b08ca1a7a9f6c2e10673e2b1d3accae9799b8b4c..89a991060a35f46913fc0e86f3dc4c1e399147f9 100644 (file)
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/keep-test-e2e-{k8s_versions}-upgrade-{capm3_target_branch}(\s(.|\n)*)?'
+        trigger-phrase: '.*?/keep-test-e2e-{k8s_versions}-upgrade-{capm3_target_branch}.*?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True
index 946d3b46c47e1411a58167ba372b18a2896363c6..e2ed626ae30f59d6bac3bb6d132949007e751970 100644 (file)
@@ -99,7 +99,7 @@
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/keep-test-{image_os}-integration-{capm3_target_branch}(\s(.|\n)*)?'
+        trigger-phrase: '.*?/keep-test-{image_os}-integration-{capm3_target_branch}.*?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True
index 52108557e4b6b8c4d6e969a4f683f18be20c0c2e..031698a9de45f426de25862c33562d0644e05b25 100644 (file)
@@ -91,7 +91,7 @@
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/test-integration-metal3-dev-tools-{image_os}(\s(.|\n)*)?'
+        trigger-phrase: '.*?/test-integration-metal3-dev-tools-{image_os}.*?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True
index e68c9702b7fee125fe086cc41e03e9fce8aa8985..f2d76d224db7cfad4000ad6df2049a26058a293e 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
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