From 532c1733603315385e8eb6b240d7aa0084a79e9b Mon Sep 17 00:00:00 2001 From: Lasse Kaihlavirta Date: Fri, 30 Oct 2020 17:23:38 +0200 Subject: [PATCH] Remove obsolete TestNG JJB templates - remove testng CSIT templates that are not used now and should not be used by any CSIT project in the future (SDC is running these now differently from its own project as part of maven build) - clean up the currently disabled SDC CSIT just in case: - remove references to testng CSIT templates - remove CSIT trigger jobs Issue-ID: CIMAN-393 Signed-off-by: Lasse Kaihlavirta Change-Id: I763dd147e3e8a9f1de2b859472ac73f4924652d1 --- jjb/integration/integration-templates-csit.yaml | 342 ------------------------ jjb/sdc/sdc-csit.yaml | 10 +- 2 files changed, 5 insertions(+), 347 deletions(-) diff --git a/jjb/integration/integration-templates-csit.yaml b/jjb/integration/integration-templates-csit.yaml index b6568ae98..a841ad9de 100644 --- a/jjb/integration/integration-templates-csit.yaml +++ b/jjb/integration/integration-templates-csit.yaml @@ -123,174 +123,6 @@ notify-every-unstable-build: false send-to-individuals: true -- job-template: - name: '{project-name}-{stream}-verify-csit-{functionality}-testng' - disabled: '{disabled}' - - project-type: freestyle - build-node: 'ubuntu1804-docker-8c-8g' - node: '{build-node}' - recipients: '' - java-version: 'openjdk11' - - properties: - - lf-infra-properties: - project: 'integration/csit' - build-days-to-keep: '{build-days-to-keep}' - - parameters: - - infra-parameters: - project: 'integration/csit' - branch: '{branch}' - refspec: 'refs/heads/{branch}' - artifacts: '{archive-artifacts}' - - integration-test-plan: - test-plan: 'plans/{project-name}/{functionality}' - - integration-test-options: - test-options: '{robot-options}' - - html-publisher-dir: - html-dir: '{html-dir}' - - html-publisher-files: - html-files: '{html-files}' - - 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}' - - triggers: - - gerrit-trigger-patch-submitted: - server: '{server-name}' - project: 'integration/csit' - branch: '{branch}' - files: '**/{project-name}/**' - - builders: - - lf-update-java-alternatives: - java-version: '{java-version}' - - integration-install-robotframework - - inject: - properties-file: 'env.properties' - - integration-run-test - - publishers: - - testng: - pattern: archives/testng-results.xml - escape-test-description: true - escape-exception-msg: true - show-failed-builds: true - unstable-on-skipped-tests: false - failure-on-failed-test-config: false - - junit: - results: archives/testng-results.xml - health-scale-factor: 1.0 - allow-empty-results: true - - integration-robot: - unstable-if: 0.0 - pass-if: 100.0 - - html-publisher: - allow-missing: true - dir: '{html-dir}' - files: '{html-files}' - keep-all: false - link-to-last-build: false - name: ExtentReport - - lf-infra-publish - - email: - recipients: '{recipients}' - notify-every-unstable-build: false - send-to-individuals: true - -- job-template: - name: '{project-name}-arm64-{stream}-verify-csit-{functionality}-testng' - disabled: '{disabled}' - - project-type: freestyle - build-node: 'ubuntu1804-docker-arm64-4c-2g' - node: '{build-node}' - recipients: '' - java-version: 'openjdk11' - - properties: - - lf-infra-properties: - project: 'integration/csit' - build-days-to-keep: '{build-days-to-keep}' - - parameters: - - infra-parameters: - project: 'integration/csit' - branch: '{branch}' - refspec: 'refs/heads/{branch}' - artifacts: '{archive-artifacts}' - - integration-test-plan: - test-plan: 'plans/{project-name}/{functionality}' - - integration-test-options: - test-options: '{robot-options}' - - html-publisher-dir: - html-dir: '{html-dir}' - - html-publisher-files: - html-files: '{html-files}' - - 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}' - - triggers: - - gerrit-trigger-patch-submitted: - server: '{server-name}' - project: 'integration/csit' - branch: '{branch}' - files: '**/{project-name}/**' - - builders: - - lf-update-java-alternatives: - java-version: '{java-version}' - - integration-install-robotframework - - inject: - properties-file: 'env.properties' - - integration-run-test - - publishers: - - testng: - pattern: archives/testng-results.xml - escape-test-description: true - escape-exception-msg: true - show-failed-builds: true - unstable-on-skipped-tests: false - failure-on-failed-test-config: false - - junit: - results: archives/testng-results.xml - health-scale-factor: 1.0 - allow-empty-results: true - - integration-robot: - unstable-if: 0.0 - pass-if: 100.0 - - html-publisher: - allow-missing: true - dir: '{html-dir}' - files: '{html-files}' - keep-all: false - link-to-last-build: false - name: ExtentReport - - lf-infra-publish - - email: - recipients: '{recipients}' - notify-every-unstable-build: false - send-to-individuals: true - - job-template: name: '{project-name}-{stream}-csit-{functionality}' disabled: '{disabled}' @@ -420,177 +252,3 @@ recipients: '{recipients}' notify-every-unstable-build: false send-to-individuals: true - -- job-template: - name: '{project-name}-{stream}-csit-{functionality}-testng' - disabled: '{disabled}' - - project-type: freestyle - build-node: 'ubuntu1804-docker-8c-8g' - node: '{build-node}' - recipients: '' - java-version: 'openjdk11' - - properties: - - lf-infra-properties: - project: 'integration/csit' - build-days-to-keep: '{build-days-to-keep}' - - parameters: - - infra-parameters: - project: 'integration/csit' - branch: '{branch}' - refspec: 'refs/heads/{branch}' - artifacts: '{archive-artifacts}' - - integration-test-plan: - test-plan: 'plans/{project-name}/{functionality}' - - integration-test-options: - test-options: '{robot-options}' - - html-publisher-dir: - html-dir: '{html-dir}' - - html-publisher-files: - html-files: '{html-files}' - - 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}' - - triggers: - - gerrit-trigger-patch-merged: - server: '{server-name}' - project: 'integration/csit' - branch: '{branch}' - files: '**/{project-name}/**' - - timed: '@daily' - - reverse: - jobs: '{obj:trigger_jobs}' - - builders: - - lf-update-java-alternatives: - java-version: '{java-version}' - - integration-install-robotframework - - inject: - properties-file: 'env.properties' - - integration-run-test - - publishers: - - integration-robot: - unstable-if: 0.0 - pass-if: 100.0 - - testng: - pattern: archives/testng-results.xml - escape-test-description: true - escape-exception-msg: true - show-failed-builds: true - unstable-on-skipped-tests: false - failure-on-failed-test-config: false - - junit: - results: archives/testng-results.xml - health-scale-factor: 1.0 - allow-empty-results: true - - html-publisher: - allow-missing: true - dir: '{html-dir}' - files: '{html-files}' - keep-all: false - link-to-last-build: false - name: ExtentReport - - lf-infra-publish - - email: - recipients: '{recipients}' - notify-every-unstable-build: false - send-to-individuals: true - -- job-template: - name: '{project-name}-arm64-{stream}-csit-{functionality}-testng' - disabled: '{disabled}' - - project-type: freestyle - build-node: 'ubuntu1804-docker-arm64-4c-2g' - node: '{build-node}' - recipients: '' - java-version: 'openjdk11' - - properties: - - lf-infra-properties: - project: 'integration/csit' - build-days-to-keep: '{build-days-to-keep}' - - parameters: - - infra-parameters: - project: 'integration/csit' - branch: '{branch}' - refspec: 'refs/heads/{branch}' - artifacts: '{archive-artifacts}' - - integration-test-plan: - test-plan: 'plans/{project-name}/{functionality}' - - integration-test-options: - test-options: '{robot-options}' - - html-publisher-dir: - html-dir: '{html-dir}' - - html-publisher-files: - html-files: '{html-files}' - - 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}' - - triggers: - - gerrit-trigger-patch-merged: - server: '{server-name}' - project: 'integration/csit' - branch: '{branch}' - files: '**/{project-name}/**' - - timed: '@daily' - - reverse: - jobs: '{obj:trigger_jobs}' - - builders: - - lf-update-java-alternatives: - java-version: '{java-version}' - - integration-install-robotframework - - inject: - properties-file: 'env.properties' - - integration-run-test - - publishers: - - integration-robot: - unstable-if: 0.0 - pass-if: 100.0 - - testng: - pattern: archives/testng-results.xml - escape-test-description: true - escape-exception-msg: true - show-failed-builds: true - unstable-on-skipped-tests: false - failure-on-failed-test-config: false - - junit: - results: archives/testng-results.xml - health-scale-factor: 1.0 - allow-empty-results: true - - html-publisher: - allow-missing: true - dir: '{html-dir}' - files: '{html-files}' - keep-all: false - link-to-last-build: false - name: ExtentReport - - lf-infra-publish - - email: - recipients: '{recipients}' - notify-every-unstable-build: false - send-to-individuals: true diff --git a/jjb/sdc/sdc-csit.yaml b/jjb/sdc/sdc-csit.yaml index 4eb680401..51654c555 100644 --- a/jjb/sdc/sdc-csit.yaml +++ b/jjb/sdc/sdc-csit.yaml @@ -2,8 +2,8 @@ - project: name: sdc-csit jobs: - - '{project-name}-{stream}-verify-csit-{functionality}-testng' - - '{project-name}-{stream}-csit-{functionality}-testng' + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' project-name: 'sdc' disabled: true recipients: 'ofir.sonsino@intl.att.com' @@ -12,11 +12,11 @@ branch: 'master' functionality: - 'sanity': - trigger_jobs: '{project-name}-{stream}-sdc-merge-java' + trigger_jobs: - 'nightly': - trigger_jobs: '{project-name}-{stream}-docker-version-java-daily' + trigger_jobs: - 'uiSanity': - trigger_jobs: '{project-name}-{stream}-docker-version-java-daily' + trigger_jobs: robot-options: '' branch: 'master' html-dir: 'archives' -- 2.16.6