fix(hicn.yaml): specify architecture in functest trigger

This prevents the functional tests for x86_64 to start when
the build job for aarch64 completes. Since the success message
triggering the functional test was the same for x86_64 and aarch64,
there was no way to distinguish what build jobs completed first.

Also:
  Archive *.deb artifacts to be reused in functest jobs, thus avoiding
  to compile the code twice.

Change-Id: Ibef007eabd57ff417aff1a55e949c11e2e2d9d6a
Signed-off-by: Mauro Sardara <[email protected]>

diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index 4468b03..e088757 100644 (file)
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -287,7 +287,7 @@
           server-name: 'Primary'
           trigger-on:
             - comment-added-contains-event:
-                comment-contains-value: 'build_success'
+                comment-contains-value: 'build_success-{stream}-{os}-{executor-arch}'
           projects:
             - project-compare-type: 'ANT'
               project-pattern: '{name}'

diff --git a/jjb/hicn/hicn.yaml b/jjb/hicn/hicn.yaml
index 7506119..19ea85b 100644 (file)
--- a/jjb/hicn/hicn.yaml
+++ b/jjb/hicn/hicn.yaml
@@ -264,7 +264,7 @@
           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"
+          successful-message: "build_success-{stream}-{os}-{executor-arch}"
           skip-vote:
             successful: true
             failed: false
@@ -279,6 +279,8 @@
 
     publishers:
       - fdio-infra-publish
+      - archive-artifacts:
+          artifacts: "packages/*.deb, packages/*.rpm"
 
 - job-template:
     name: "hicn-verify-functest-{stream}-{os}-{executor-arch}"
@@ -315,6 +317,9 @@
       - gerrit-trigger-build:
           name: "{project}"
           branch: "{branch}"
+          stream: "{stream}"
+          os: "{os}"
+          executor-arch: "{executor-arch}"
 
     builders:
       - shell: !include-raw-escape: