From e659e858cf3df80c9d2d9bc8f80576ccfd72bd4d Mon Sep 17 00:00:00 2001 From: Lasse Kaihlavirta Date: Mon, 25 Jan 2021 17:23:25 +0200 Subject: [PATCH] Remove obsolete verification templates - remove obsolete review and merge verification templates - comment out music CSIT job definition that was using those templates (new templates for golang are needed if music CSIT need to be supported in the future) Issue-ID: INT-1823, INT-1833 Signed-off-by: Lasse Kaihlavirta Change-Id: Ic0fffa1e8edf5bf2d90f9d53fbe946d0f37560ca --- jjb/integration/integration-templates-csit.yaml | 148 ------------------------ jjb/music/music-distributed-kv-store-csit.yaml | 43 ++++--- 2 files changed, 25 insertions(+), 166 deletions(-) diff --git a/jjb/integration/integration-templates-csit.yaml b/jjb/integration/integration-templates-csit.yaml index 86206db18..d3face155 100644 --- a/jjb/integration/integration-templates-csit.yaml +++ b/jjb/integration/integration-templates-csit.yaml @@ -441,151 +441,3 @@ files: '**' publishers: - lf-infra-publish - -- job-template: - # Job template for review verification jobs in - # project-specific CSIT flow - # - # The purpose of this job template is to: - # 1. trigger snapshot docker build job - # 2. trigger CSIT job - # 3. give a verify vote to the triggering review - # - - name: '{project-name}-review-verification-{stream}' - disabled: '{disabled}' - project-type: freestyle - build-node: 'ubuntu1804-docker-8c-8g' - java-version: 'openjdk11' - - properties: - - lf-infra-properties: - project: '{project}' - build-days-to-keep: '{build-days-to-keep}' - parameters: - - infra-parameters: - project: '{project}' - branch: '{branch}' - refspec: 'refs/heads/{branch}' - artifacts: '{archive-artifacts}' - scm: - - gerrit-trigger-scm: - refspec: '$GERRIT_REFSPEC' - choosing-strategy: 'gerrit' - submodule-recursive: '{submodule-recursive}' - wrappers: - - lf-infra-wrappers: - build-timeout: '{build-timeout}' - jenkins-ssh-credential: '{jenkins-ssh-credential}' - builders: - - lf-infra-pre-build - - lf-maven-install: - mvn-version: "{mvn-version}" - - lf-update-java-alternatives: - java-version: "{java-version}" - - lf-provide-maven-settings: - global-settings-file: "{mvn-global-settings}" - settings-file: "{mvn-settings}" - - trigger-builds: - - project: "{project-name}-{stream}-{artifact-type}-docker-snapshot" - predefined-parameters: | - UNIQUE_DOCKER_TAG=$BUILD_TAG - PROJECT=$PROJECT - BRANCH=$BRANCH - GERRIT_REFSPEC=$GERRIT_REFSPEC - block: true - - trigger-builds: - - project: "{project-name}-{stream}-project-csit" - predefined-parameters: | - UNIQUE_DOCKER_TAG=$BUILD_TAG - PROJECT=$PROJECT - BRANCH=$BRANCH - GERRIT_REFSPEC=$GERRIT_REFSPEC - block: true - triggers: - - gerrit-trigger-patch-submitted: - server: '{server-name}' - project: '{project}' - branch: '{branch}' - files: '**' - publishers: - - lf-infra-publish - -- job-template: - # Job template for merge verification jobs in - # project-specific CSIT flow - # - # The purpose of this job template is to trigger - # the following jobs in sequence: - # 1. snapshot docker build job - # 2. CSIT job - # 3. docker staging job - # - - name: '{project-name}-merge-verification-{stream}' - disabled: '{disabled}' - project-type: freestyle - build-node: 'ubuntu1804-docker-8c-8g' - java-version: 'openjdk11' - - properties: - - lf-infra-properties: - project: '{project}' - build-days-to-keep: '{build-days-to-keep}' - parameters: - - infra-parameters: - project: '{project}' - branch: '{branch}' - refspec: 'refs/heads/{branch}' - artifacts: '{archive-artifacts}' - scm: - - gerrit-trigger-scm: - refspec: '' - choosing-strategy: 'default' - submodule-recursive: '{submodule-recursive}' - wrappers: - - lf-infra-wrappers: - build-timeout: '{build-timeout}' - jenkins-ssh-credential: '{jenkins-ssh-credential}' - builders: - - lf-infra-pre-build - - lf-maven-install: - mvn-version: "{mvn-version}" - - lf-update-java-alternatives: - java-version: "{java-version}" - - lf-provide-maven-settings: - global-settings-file: "{mvn-global-settings}" - settings-file: "{mvn-settings}" - - trigger-builds: - - project: "{project-name}-{stream}-{artifact-type}-docker-snapshot" - predefined-parameters: | - UNIQUE_DOCKER_TAG=$BUILD_TAG - PROJECT=$PROJECT - BRANCH=$BRANCH - GERRIT_REFSPEC=$GERRIT_REFSPEC - block: true - - trigger-builds: - - project: "{project-name}-{stream}-project-csit" - predefined-parameters: | - UNIQUE_DOCKER_TAG=$BUILD_TAG - PROJECT=$PROJECT - BRANCH=$BRANCH - GERRIT_REFSPEC=$GERRIT_REFSPEC - block: true - - trigger-builds: - - project: "{project-name}-{stream}-docker-staging" - predefined-parameters: | - UNIQUE_DOCKER_TAG=$BUILD_TAG - PROJECT=$PROJECT - BRANCH=$BRANCH - GERRIT_REFSPEC=$GERRIT_REFSPEC - block: true - triggers: - - gerrit-trigger-patch-merged: - server: '{server-name}' - project: '{project}' - branch: '{branch}' - files: '**' - publishers: - - lf-infra-publish - diff --git a/jjb/music/music-distributed-kv-store-csit.yaml b/jjb/music/music-distributed-kv-store-csit.yaml index 3f53eeaac..ab491475d 100644 --- a/jjb/music/music-distributed-kv-store-csit.yaml +++ b/jjb/music/music-distributed-kv-store-csit.yaml @@ -1,18 +1,25 @@ ---- -- project: - name: music-distributed-kv-store-csit - jobs: - - '{project-name}-{stream}-project-csit' - - '{project-name}-review-verification-{stream}' - - '{project-name}-merge-verification-{stream}' - project-name: 'music-distributed-kv-store' - project: 'music/distributed-kv-store' - disabled: true - stream: 'master' - artifact-type: 'golang' - java-version: openjdk11 - mvn-version: 'mvn36' - mvn-settings: 'music-distributed-kv-store-settings' - mvn-global-settings: global-settings - robot-options: '' - branch: 'master' +# Integration templates no longer support these +# job definitions; if Music CSIT needs to be restored, +# '{project-name}-review-verification-golang-{stream}' +# '{project-name}-merge-verification-golag-{stream}' +# would have to be added to integration templates and +# applied here +# +#--- +#- project: +# name: music-distributed-kv-store-csit +# jobs: +# - '{project-name}-{stream}-project-csit' +# - '{project-name}-review-verification-{stream}' +# - '{project-name}-merge-verification-{stream}' +# project-name: 'music-distributed-kv-store' +# project: 'music/distributed-kv-store' +# disabled: true +# stream: 'master' +# artifact-type: 'golang' +# java-version: openjdk11 +# mvn-version: 'mvn36' +# mvn-settings: 'music-distributed-kv-store-settings' +# mvn-global-settings: global-settings +# robot-options: '' +# branch: 'master' -- 2.16.6