diff options
author | Vanessa Rene Valderrama <vvalderrama@linuxfoundation.org> | 2020-02-19 17:03:11 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@fd.io> | 2020-02-19 17:03:11 +0000 |
commit | c3503f371589ad5e0e9b90ee5188e781a94e0142 (patch) | |
tree | 3e11d0e82042370cf7a03463159b6be8b67f7a1c | |
parent | e93c44c34c1345a88d024ee12f7de27e5ff74060 (diff) | |
parent | 1e9d2e1cccbd85b358f8385744666185ed987df1 (diff) |
Merge "TRex: Remove unneeded jobs"
-rw-r--r-- | jjb/trex/include-raw-trex-build.sh | 26 | ||||
-rw-r--r-- | jjb/trex/trex.yaml | 104 |
2 files changed, 4 insertions, 126 deletions
diff --git a/jjb/trex/include-raw-trex-build.sh b/jjb/trex/include-raw-trex-build.sh deleted file mode 100644 index 4fe22b556..000000000 --- a/jjb/trex/include-raw-trex-build.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash -ex - -# building core - -cd linux_dpdk -./b configure -./b build -cd - - -cd linux -./b configure -./b build -cd - - -# building docs -# Commented out to trex-docs is integrated into trex repo - -#cd trex-doc -#./b configure -#./b build -#cd - - -echo "*******************************************************************" -echo "* TREX BUILD SUCCESSFULLY COMPLETED" -echo "*******************************************************************" - diff --git a/jjb/trex/trex.yaml b/jjb/trex/trex.yaml index 0d8cea906..a72634c64 100644 --- a/jjb/trex/trex.yaml +++ b/jjb/trex/trex.yaml @@ -1,19 +1,9 @@ ---- -- project: - name: trex - jobs: - - 'trex-verify-{stream}-{os}' - - 'trex-merge-{stream}-{os}' - project: 'trex' - os: - - ubuntu1404 - - ubuntu1604 - - centos7 +--- +# TRex project has moved to github long time ago. +# https://github.com/cisco-system-traffic-generator/trex-core/blob/master/CONTRIBUTING.md - stream: - - master: - branch: 'master' +# TODO: Do we even need the INFO.yaml job if fd.io git is outdated? - project: name: trex-view @@ -21,92 +11,6 @@ - project-view project-name: trex -- job-template: - name: 'trex-verify-{stream}-{os}' - - project-type: freestyle - node: '{os}-builder-4c-4g' - concurrent: true - - build-discarder: - daysToKeep: '{build-days-to-keep}' - numToKeep: '{build-num-to-keep}' - artifactDaysToKeep: '{build-artifact-days-to-keep}' - artifactNumToKeep: '{build-artifact-num-to-keep}' - - parameters: - - project-parameter: - project: '{project}' - - gerrit-parameter: - branch: '{branch}' - - os-parameter: - os: '{os}' - - scm: - - gerrit-trigger-scm: - credentials-id: 'jenkins-gerrit-credentials' - refspec: '$GERRIT_REFSPEC' - choosing-strategy: 'gerrit' - - wrappers: - - fdio-infra-wrappers: - build-timeout: '{build-timeout}' - - triggers: - - gerrit-trigger-patch-submitted: - name: '{project}' - branch: '{branch}' - - builders: - - shell: - !include-raw-escape: include-raw-trex-build.sh - - publishers: - - lf-infra-publish - -- job-template: - name: 'trex-merge-{stream}-{os}' - - project-type: freestyle - node: '{os}-builder-4c-4g' - concurrent: true - - build-discarder: - daysToKeep: '{build-days-to-keep}' - numToKeep: '{build-num-to-keep}' - artifactDaysToKeep: '{build-artifact-days-to-keep}' - artifactNumToKeep: '{build-artifact-num-to-keep}' - - parameters: - - project-parameter: - project: '{project}' - - gerrit-parameter: - branch: '{branch}' - - os-parameter: - os: '{os}' - - scm: - - gerrit-trigger-scm: - credentials-id: 'jenkins-gerrit-credentials' - refspec: '$GERRIT_REFSPEC' - choosing-strategy: 'gerrit' - - wrappers: - - fdio-infra-wrappers: - build-timeout: '{build-timeout}' - - triggers: - - gerrit-trigger-patch-merged: - name: '{project}' - branch: '{branch}' - - builders: - - shell: - !include-raw-escape: include-raw-trex-build.sh - - publishers: - - lf-infra-publish - - project: name: trex-info project-name: trex |