fix(hicn.yaml): fix triggers for build/ftest jobs

[ci-management.git] / jjb / hicn / hicn.yaml

diff --git a/jjb/hicn/hicn.yaml b/jjb/hicn/hicn.yaml
index 2667a8a..3a37d1d 100644 (file)
--- a/jjb/hicn/hicn.yaml
+++ b/jjb/hicn/hicn.yaml
@@ -15,7 +15,8 @@
 - project:
     name: hicn-x86_64
     jobs:
-      - "hicn-verify-{stream}-{os}-{executor-arch}"
+      - "hicn-verify-build-{stream}-{os}-{executor-arch}"
+      - "hicn-verify-functest-{stream}-{os}-{executor-arch}"
       - "hicn-merge-{stream}-{os}-{executor-arch}"
     project: "hicn"
     os: ubuntu2004
@@ -27,7 +28,7 @@
 - project:
     name: hicn-aarch64
     jobs:
-      - "hicn-verify-{stream}-{os}-{executor-arch}"
+      - "hicn-verify-build-{stream}-{os}-{executor-arch}"
       - "hicn-merge-{stream}-{os}-{executor-arch}"
     project: "hicn"
     os: ubuntu2004
@@ -77,6 +78,59 @@
       - project-view
     project-name: hicn
 
+- project:
+    name: hicn-sonar
+    jobs:
+      - hicn-sonar-scanner
+    project: hicn
+    sonarcloud: true
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}-{project}"
+    stream:
+      - hicn:
+          branch: "master"
+
+- job-template:
+    name: hicn-sonar-scanner
+
+    project-type: freestyle
+    node: centos7-docker-4c-4g
+    concurrent: true
+
+    parameters:
+      - project-parameter:
+          project: "{project}"
+      - gerrit-parameter:
+          branch: "{branch}"
+      - stream-parameter:
+          stream: "{stream}"
+
+    scm:
+      - gerrit-trigger-scm:
+          credentials-id: "jenkins-gerrit-credentials"
+          refspec: ""
+          choosing-strategy: "default"
+
+    wrappers:
+      - fdio-infra-wrappers:
+          build-timeout: "{build-timeout}"
+
+    triggers:
+      - gerrit-trigger-patch-merged:
+          name: "{project}"
+          branch: "{branch}"
+
+    builders:
+      - inject:
+          properties-content: |
+            SONAR_HOST_URL=https://sonarcloud.io
+            PROJECT_KEY={sonarcloud-project-key}
+            PROJECT_ORGANIZATION={sonarcloud-project-organization}
+            API_TOKEN={sonarcloud-api-token}
+      - shell: !include-raw-escape:
+          - ../scripts/hicn/sonar.sh
+
 - job-template:
     name: "hicn-checkstyle-verify-{stream}-{os}-{executor-arch}"
 
@@ -161,7 +215,7 @@
           fixed-delay: 90
 
 - job-template:
-    name: "hicn-verify-{stream}-{os}-{executor-arch}"
+    name: "hicn-verify-build-{stream}-{os}-{executor-arch}"
 
     project-type: freestyle
     node: "builder-{os}-prod-{executor-arch}"
@@ -192,9 +246,31 @@
           build-timeout: 120
 
     triggers:
-      - gerrit-trigger-checkstyle:
-          name: "{project}"
-          branch: "{branch}"
+      - gerrit:
+          server-name: 'Primary'
+          trigger-on:
+            - comment-added-contains-event:
+                comment-contains-value: 'checkstyle_success'
+          projects:
+            - project-compare-type: 'ANT'
+              project-pattern: '{name}'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+          override-votes: true
+          gerrit-build-notbuilt-verified-value: 0
+          gerrit-build-successful-verified-value: 1
+          # yamllint disable-line rule:line-length
+          notbuilt-message: "Automatic retry of failed jobs may be in process. A proper vote should be set when retry completes."
+          # yamllint disable-line rule:line-length
+          failed-message: "Build failed. No further verify jobs will be started."
+          successful-message: "build_success"
+          skip-vote:
+            successful: true
+            failed: false
+            unstable: false
+            notbuilt: false
+
 
     builders:
       - shell: !include-raw-escape:
@@ -205,6 +281,50 @@
     publishers:
       - fdio-infra-publish
 
+- job-template:
+    name: "hicn-verify-functest-{stream}-{os}-{executor-arch}"
+
+    project-type: freestyle
+    node: "centos7-docker-4c-4g"
+    concurrent: true
+
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
+
+    parameters:
+      - project-parameter:
+          project: "{project}"
+      - gerrit-parameter:
+          branch: "{branch}"
+      - os-parameter:
+          os: "{os}"
+      - stream-parameter:
+          stream: "{stream}"
+
+    scm:
+      - gerrit-trigger-scm:
+          credentials-id: "jenkins-gerrit-credentials"
+          refspec: "$GERRIT_REFSPEC"
+          choosing-strategy: "gerrit"
+
+    wrappers:
+      - fdio-infra-wrappers:
+          build-timeout: 120
+
+    triggers:
+      - gerrit-trigger-build:
+          name: "{project}"
+          branch: "{branch}"
+
+    builders:
+      - shell: !include-raw-escape:
+          - ../scripts/hicn/functest.sh
+
+    publishers:
+      - robot-report:
+          output-path: 'tests'
+
 - job-template:
     name: "hicn-merge-{stream}-{os}-{executor-arch}"
 
@@ -261,20 +381,6 @@
     publishers:
       - fdio-infra-publish
 
-- project:
-    name: hicn-sonar
-    project: hicn
-    project-name: hicn
-    mvn-settings: hicn-settings
-    sonarcloud: true
-    sonarcloud-project-organization: "{sonarcloud_project_organization}"
-    sonarcloud-api-token: "{sonarcloud_api_token}"
-    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
-    branch: master
-    build-node: centos7-docker-2c-2g
-    jobs:
-      - gerrit-maven-sonar
-
 - job-template:
     name: "hicn-extras-verify-{stream}-{os}-{executor-arch}"