diff options
| author |   Dave Wallace <dwallacelf@gmail.com> | 2020-12-04 16:23:01 -0500 |
|---|---|---|
| committer | Dave Wallace <dwallacelf@gmail.com> | 2020-12-15 16:53:50 -0500 |
| commit | 2be6e2e770f6f9836d12ff10ab5b3bd32e7d6892 (patch) | |
| tree | 2968c6bf8c2bd3184a6fa7b35512fac573cc6073 /jjb/cicn | |
| parent | 883c9a1b6c314d7f6729ff746cb4cacd06a16184 (diff) | |
Use 'lftools deploy archives' for log upload
- This is a pre-requisite for using amazon S3
for log storage.
- Requires docker images built by updated
docker scripts to include packages required
by 'lftools' or other project specific
docker images to be upgraded with same
packages. This change only updates jobs
which are using fdiotools docker images.
- Add FD.io specific global macros to avoid
inflating docker images with packages
required by unneeded global-jjb scripts.
- Sort VPP job parameters alphabetically
- Dump installed python3 packages in
setup_executor_env.sh
Change-Id: Ifddd8f2b70b10acf834ffc837b27ef5453213a86
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
Diffstat (limited to 'jjb/cicn')
| -rw-r--r-- | jjb/cicn/cicn.yaml | 41 |
1 files changed, 17 insertions, 24 deletions
diff --git a/jjb/cicn/cicn.yaml b/jjb/cicn/cicn.yaml index d526ea6f3..5f618c627 100644 --- a/jjb/cicn/cicn.yaml +++ b/jjb/cicn/cicn.yaml @@ -1,3 +1,16 @@ +# Copyright (c) 2020 Cisco and/or its affiliates. +# 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. + --- - project: name: cicn-libparc-x86_64 @@ -96,10 +109,6 @@ repo-name: "{repo-stream-part}.{repo-os-part}" - stream-parameter: stream: "hicn" - - string: - name: ARCHIVE_ARTIFACTS - default: "{archive-artifacts}" - description: Artifacts to archive to the logs server. scm: - gerrit-trigger-scm: @@ -144,8 +153,7 @@ - ../scripts/packagecloud_push.sh publishers: - - fdio-infra-shiplogs: - maven-version: "mvn33-new" + - fdio-infra-publish - job-template: name: "cicn-libparc-verify-{stream}-{os}-{executor-arch}" @@ -167,10 +175,6 @@ branch: "{branch}" - os-parameter: os: "{os}" - - string: - name: ARCHIVE_ARTIFACTS - default: "{archive-artifacts}" - description: Artifacts to archive to the logs server. scm: - gerrit-trigger-scm: @@ -192,8 +196,7 @@ - include-raw-cicn-libparc-build.sh publishers: - - fdio-infra-shiplogs: - maven-version: "mvn33-new" + - fdio-infra-publish - job-template: name: "cicn-viper-merge-{stream}-{os}-{executor-arch}" @@ -222,10 +225,6 @@ repo-name: "{repo-stream-part}.{repo-os-part}" - stream-parameter: stream: "hicn" - - string: - name: ARCHIVE_ARTIFACTS - default: "{archive-artifacts}" - description: Artifacts to archive to the logs server. scm: - gerrit-trigger-scm: @@ -273,8 +272,7 @@ - ../scripts/packagecloud_push.sh publishers: - - fdio-infra-shiplogs: - maven-version: "mvn33-new" + - fdio-infra-publish - job-template: name: "cicn-viper-verify-{stream}-{os}-{executor-arch}" @@ -296,10 +294,6 @@ branch: "{branch}" - os-parameter: os: "{os}" - - string: - name: ARCHIVE_ARTIFACTS - default: "{archive-artifacts}" - description: Artifacts to archive to the logs server. scm: - gerrit-trigger-scm: @@ -321,8 +315,7 @@ - include-raw-cicn-viper-build.sh publishers: - - fdio-infra-shiplogs: - maven-version: "mvn33-new" + - fdio-infra-publish - project: name: cicn-info |