From 37a55a05cd6ac7ca15bbb99f5ddc9ca61874d5f8 Mon Sep 17 00:00:00 2001 From: pmikus Date: Thu, 8 Jul 2021 12:34:33 +0000 Subject: Global: Rework archive artifacts This patch removes archive-artifacts-parameter macro and ARCHVIVE_ARTIFACTS env var from csit and vpp project. All project specific artifacts to be uploaded with the log files SHOULD BE copied to $WORKSPACE/archives. The next step once this is merged will be to remove NEXUS entirely via JCasC. + Remove archive-artifacts from all csit/vpp yaml files. + Add fdio-infra-ship-backup-logs macro + Remove unused jjb/include-raw-deploy-archives.sh + CSIT: - copy job artifacts to $WORKSPACE/archives + HC2VPP - remove CSIT + TLDK: - remove CSIT Signed-off-by: pmikus Signed-off-by: Dave Wallace Change-Id: Iada020cf269714c34f9ce32d764d991827e3b003 --- jjb/hc2vpp/hc2vpp-csit.yaml | 421 -------------------------------------------- 1 file changed, 421 deletions(-) delete mode 100644 jjb/hc2vpp/hc2vpp-csit.yaml (limited to 'jjb/hc2vpp/hc2vpp-csit.yaml') diff --git a/jjb/hc2vpp/hc2vpp-csit.yaml b/jjb/hc2vpp/hc2vpp-csit.yaml deleted file mode 100644 index 76ef8741a..000000000 --- a/jjb/hc2vpp/hc2vpp-csit.yaml +++ /dev/null @@ -1,421 +0,0 @@ ---- -- project: - name: hc2vpp-csit - description: 'jenkins jobs to test Hc2vpp features.' - jobs: - - 'hc2vpp-csit-integration-{stream}-{os}' - - 'hc2vpp-csit-verify-{stream}-{os}' - - 'hc2vpp-csit-integration-odl-{odl}-{stream}-{os}' - - 'hc2vpp-csit-verify-odl-{odl}-{stream}-{os}' - project: 'hc2vpp' - build-artifact-num-to-keep: 10 - stream: - - master: - branch: 'master' - repo-stream-part: 'master' - - '1904': - branch: 'stable/1904' - repo-stream-part: 'stable.1904' - - os: - - ubuntu1804: - repo-os-part: 'ubuntu.bionic.main' - - odl: 'neon' - -- project: - name: csit-hc2vpp-perf - description: 'jenkins jobs to test Hc2vpp performance.' - jobs: - - 'hc2vpp-csit-perf-{stream}-{os}' - project: 'hc2vpp' - build-artifact-num-to-keep: 10 - stream: - - master: - branch: 'master' - repo-stream-part: 'master' - - os: - - ubuntu1804: - repo-os-part: 'ubuntu.bionic.main' - - odl: 'neon' - -- job-template: - name: 'hc2vpp-csit-integration-{stream}-{os}' - - project-type: freestyle - node: '{os}-builder-4c-4g' - concurrent: true - archive-artifacts: '**/csit/archive/*.*' - latest-only: false - - - 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}' - - os-parameter: - os: '{os}' - - stream-parameter: - stream: '{stream}' - - string: - name: ARCHIVE_ARTIFACTS - default: '{archive-artifacts}' - description: Artifacts to archive to the logs server. - - scm: - - git-scm: - credentials-id: 'jenkins-gerrit-credentials' - branch: '{branch}' - - wrappers: - - fdio-infra-wrappers: - build-timeout: '{build-timeout}' - - triggers: - - reverse: - jobs: 'hc2vpp-integration-{stream}-{os}' - result: 'success' - - builders: - - shell: - !include-raw-escape: include-raw-hc2vpp-csit-integration.sh - - publishers: - - email-notification: - email-prefix: '[hc2vpp]' - - - robot-report: - output-path: 'csit/archive' - - - lf-infra-publish - -- job-template: - name: 'hc2vpp-csit-verify-{stream}-{os}' - - project-type: maven - node: '{os}-builder-4c-4g' - jdk: openjdk8-{os} - concurrent: true - archive-artifacts: '**/csit/archive/*.*' - latest-only: false - - 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}' - - maven-project-parameter: - maven: 'mvn36' - - maven-exec: - maven-version: 'mvn36' - - stream-parameter: - stream: '{stream}' - - odl-parameter: - odl: '{odl}' - - string: - name: ARCHIVE_ARTIFACTS - default: '{archive-artifacts}' - description: Artifacts to archive to the logs server. - - 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: - server-name: 'Primary' - trigger-on: - - comment-added-contains-event: - comment-contains-value: 'verify-csit' - projects: - - project-compare-type: 'ANT' - project-pattern: '{project}' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - skip-vote: - successful: true - failed: true - unstable: true - notbuilt: true - - prebuilders: - - provide-maven-settings: - settings-file: 'honeycomb-settings' - global-settings-file: 'global-settings' - - shell: - !include-raw-escape: include-raw-hc2vpp-csit-verify-prebuild.sh - - maven: - maven-name: 'mvn36' - root-pom: 'pom.xml' - # yamllint disable-line rule:line-length - goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -DskipTests -Dcheckstyle.skip=true' - maven-opts: '-Xmx2048m -Dmaven.compile.fork=true' - settings: 'hc2vpp-settings' - settings-type: cfp - global-settings: 'global-settings' - global-settings-type: cfp - - postbuilders: - - shell: - !include-raw-escape: include-raw-hc2vpp-csit-verify.sh - - publishers: - - email-notification: - email-prefix: '[hc2vpp]' - - - robot-report: - output-path: 'csit/archive' - - - lf-infra-publish - -- job-template: - name: 'hc2vpp-csit-integration-odl-{odl}-{stream}-{os}' - - project-type: freestyle - node: '{os}-builder-4c-4g' - concurrent: true - archive-artifacts: '**/csit/archive/*.*' - latest-only: false - - - 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}' - - os-parameter: - os: '{os}' - - stream-parameter: - stream: '{stream}' - - odl-parameter: - odl: '{odl}' - - string: - name: ARCHIVE_ARTIFACTS - default: '{archive-artifacts}' - description: Artifacts to archive to the logs server. - - scm: - - git-scm: - credentials-id: 'jenkins-gerrit-credentials' - branch: '{branch}' - - wrappers: - - fdio-infra-wrappers: - build-timeout: '{build-timeout}' - - triggers: - - reverse: - jobs: 'hc2vpp-integration-{stream}-{os}' - result: 'success' - - builders: - - shell: - !include-raw-escape: include-raw-hc2vpp-csit-integration-odl.sh - - publishers: - - email-notification: - email-prefix: '[hc2vpp]' - - - robot-report: - output-path: 'csit/archive' - - - lf-infra-publish - -- job-template: - name: 'hc2vpp-csit-verify-odl-{odl}-{stream}-{os}' - - project-type: maven - node: '{os}-builder-4c-4g' - jdk: openjdk8-{os} - concurrent: true - archive-artifacts: '**/csit/archive/*.*' - latest-only: false - - 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}' - - maven-project-parameter: - maven: 'mvn36' - - maven-exec: - maven-version: 'mvn36' - - stream-parameter: - stream: '{stream}' - - odl-parameter: - odl: '{odl}' - - string: - name: ARCHIVE_ARTIFACTS - default: '{archive-artifacts}' - description: Artifacts to archive to the logs server. - - 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: - server-name: 'Primary' - trigger-on: - - comment-added-contains-event: - comment-contains-value: 'verify-csit' - projects: - - project-compare-type: 'ANT' - project-pattern: '{project}' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - skip-vote: - successful: true - failed: true - unstable: true - notbuilt: true - - prebuilders: - - provide-maven-settings: - settings-file: 'honeycomb-settings' - global-settings-file: 'global-settings' - - shell: - !include-raw-escape: include-raw-hc2vpp-csit-verify-prebuild.sh - - maven: - maven-name: 'mvn36' - root-pom: 'pom.xml' - # yamllint disable-line rule:line-length - goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -DskipTests -Dcheckstyle.skip=true' - maven-opts: '-Xmx2048m -Dmaven.compile.fork=true' - settings: 'hc2vpp-settings' - settings-type: cfp - global-settings: 'global-settings' - global-settings-type: cfp - - postbuilders: - - shell: - !include-raw-escape: include-raw-hc2vpp-csit-verify-odl.sh - - publishers: - - email-notification: - email-prefix: '[hc2vpp]' - - - robot-report: - output-path: 'csit/archive' - - - lf-infra-publish - -- job-template: - name: 'hc2vpp-csit-perf-{stream}-{os}' - - project-type: freestyle - node: '{os}-builder-4c-4g' - concurrent: false - archive-artifacts: '**/csit/archive/*.*' - latest-only: false - - - 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}' - - os-parameter: - os: '{os}' - - stream-parameter: - stream: '{stream}' - - odl-parameter: - odl: '{odl}' - - string: - name: ARCHIVE_ARTIFACTS - default: '{archive-artifacts}' - description: Artifacts to archive to the logs server. - scm: - - gerrit-trigger-scm: - credentials-id: 'jenkins-gerrit-credentials' - refspec: '$GERRIT_REFSPEC' - choosing-strategy: 'gerrit' - - wrappers: - - fdio-infra-wrappers: - build-timeout: '{build-timeout}' - - triggers: - - timed: '@weekly' - - - gerrit: - server-name: 'Primary' - trigger-on: - - comment-added-contains-event: - comment-contains-value: 'verify-perf' - - projects: - - project-compare-type: 'ANT' - project-pattern: '{project}' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - skip-vote: - successful: false - failed: false - unstable: false - notbuilt: false - - builders: - - shell: - !include-raw-escape: include-raw-hc2vpp-csit-perf.sh - - publishers: - - robot-report: - output-path: 'csit/archive' - - - lf-infra-publish - -- parameter: - name: odl-parameter - parameters: - - string: - name: ODL - default: '{odl}' - description: "ODL version parameter." -- cgit 1.2.3-korg