X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fmetal3%2Fbaremetal-operator%2Fjjb-bmo-e2e.yaml;h=96a6b7eee06e0a7c5c635cedae5059a649cb9ea5;hb=e39bbd7c0a8fe75fdfed904ba5ee07a51fa8b1e0;hp=b431b956f2e73decb8f0148cb007f95e7c2e27cd;hpb=8c69b8a279c5e09dae116fd5acd99bd7316513e1;p=infra%2Fcicd.git

diff --git a/jjb/metal3/baremetal-operator/jjb-bmo-e2e.yaml b/jjb/metal3/baremetal-operator/jjb-bmo-e2e.yaml
index b431b956..96a6b7ee 100644
--- a/jjb/metal3/baremetal-operator/jjb-bmo-e2e.yaml
+++ b/jjb/metal3/baremetal-operator/jjb-bmo-e2e.yaml
@@ -1,16 +1,81 @@
 - project:
-    name: baremetal-operator
+    name: bmo
+    # Default "type" of job is "pull", as in pull request,
+    # and the default GINKGO_FOCUS is empty (all tests required in BMO PRs)
+    type: pull
+    GINKGO_FOCUS: " "
+    # Default BMO branch to trigger the test in is "main"
+    BRANCH_NAME: "main"
+    # These jobs are triggered by prow for PRs (empty trigger here) or by timer (see below)
+    triggers: []
 
     jobs:
-    - "{job_prefix}_{name}_e2e_tests"
+    - "{job_prefix}-{name}-e2e-test-{type}"
+    # This job runs the "optional" set, which currently includes only "upgrade" tests
+    - "{job_prefix}-{name}-e2e-test-{type}":
+        type: optional-pull
+        GINKGO_FOCUS: "upgrade"
+    - "{job_prefix}-{name}-e2e-test-{type}":
+        type: periodic
+        triggers:
+        # Run at 02:45 (UTC) every day
+        - timed: "45 2 * * *"
+    - "{job_prefix}-{name}-e2e-test-{type}":
+        type: optional-periodic
+        GINKGO_FOCUS: "upgrade"
+        triggers:
+        # Run at 03:45 (UTC) every day
+        - timed: "45 3 * * *"
+
+    # Pediodic jobs for release-0.6 branch
+    - "{job_prefix}-{name}-e2e-test-{type}":
+        type: periodic-release-0.6
+        BRANCH_NAME: "release-0.6"
+        triggers:
+        # Run at 01:45 (UTC) every day
+        - timed: "45 1 * * *"
+    - "{job_prefix}-{name}-e2e-test-{type}":
+        type: optional-periodic-release-0.6
+        BRANCH_NAME: "release-0.6"
+        GINKGO_FOCUS: "upgrade"
+        triggers:
+        # Run at 01:45 (UTC) every day
+        - timed: "45 1 * * *"
 
 - job-template:
-    name: "{job_prefix}_{name}_e2e_tests"
+    name: "{job_prefix}-{name}-e2e-test-{type}"
     project-type: pipeline
     defaults: global
     disabled: False
     concurrent: True
 
+    parameters:
+    # Parameters set by Prow
+    - string:
+        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
+        description: 'Project github repo org name'
+    - string:
+        name: REPO_NAME
+        description: 'Project github repo name'
+    - string:
+        name: PULL_BASE_REF
+        default: '{BRANCH_NAME}'
+        description: 'Ref name of the base branch'
+    - string:
+        name: PULL_PULL_SHA
+        description: 'Pull request head SHA'
+    # End of Prow parameters
+    - string:
+        name: GINKGO_FOCUS
+        default: '{GINKGO_FOCUS}'
+        description: 'The focus test to run'
+
     properties:
     - build-discarder:
         days-to-keep: 30
@@ -18,30 +83,9 @@
         artifact-days-to-keep: -1
         artifact-num-to-keep: -1
     - github:
-        url: https://github.com/metal3-io/baremetal-operator.git
+        url: https://github.com/metal3-io/baremetal-operator
 
-    triggers:
-    # Run at 02:45 (UTC) every day
-    - timed: "45 2 * * *"
-    - github-pull-request:
-        admin-list:
-        - "{ci_github_admin_user}"
-        org-list: "{ci_github_whitelist_org}"
-        auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/{job_prefix}_{name}_e2e_tests(\s(.|\n)*)?'
-        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: "{job_prefix}_{name}_e2e_tests"
-        success-status: "Passed"
-        failure-status: "Failed"
-        error-status: "Error"
-        cancel-builds-on-update: True
+    triggers: "{triggers}"
 
     pipeline-scm:
       scm: