diff options
author | Mauro Sardara <msardara@cisco.com> | 2022-08-17 12:00:26 +0200 |
---|---|---|
committer | Mauro Sardara <msardara@cisco.com> | 2022-08-17 12:09:41 +0200 |
commit | d1ead28c09eea482724cd16e9b93ccd734fb2a80 (patch) | |
tree | 73e4a450bdab4bf69007e81c2767a7f4f9bad739 | |
parent | 0704b6fdb6eaf6e381b6f3eba8b3935ca539df79 (diff) |
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 <msardara@cisco.com>
-rw-r--r-- | jjb/global-macros.yaml | 2 | ||||
-rw-r--r-- | jjb/hicn/hicn.yaml | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml index 4468b03b3..e0887571e 100644 --- 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 750611941..19ea85ba1 100644 --- 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: |