From 0ab56cf5597f5a144ff00d9187ae5ef405953edf Mon Sep 17 00:00:00 2001 From: Jessica Wagantall Date: Thu, 20 Oct 2022 11:05:19 -0700 Subject: [PATCH] Chore: Deprecate WhiteSource jobs It was decided on the TSC meeting Oct20 to depreate all WhiteSource jobs. Issue-ID: CIMAN-33 Signed-off-by: Jessica Wagantall Change-Id: I0ea2544143d94e3985e804d4e01bdca968b07810 --- jjb/aai/aai-aai-common.yaml | 14 -- jjb/aai/aai-model-loader.yaml | 14 -- jjb/aai/aai-resources.yaml | 12 -- jjb/aai/aai-sparky-be.yaml | 12 -- jjb/ccsdk/apps.yaml | 13 -- jjb/ccsdk/cds.yaml | 13 -- jjb/ccsdk/distribution.yaml | 15 -- jjb/ccsdk/features.yaml | 15 -- jjb/ccsdk/parent.yaml | 13 -- jjb/ccsdk/sli.yaml | 13 -- jjb/ci-management/ci-management-views.yaml | 8 - jjb/cps/cps-cps-temporal.yaml | 14 -- jjb/cps/cps-ncmp-dmi-plugin.yaml | 14 -- jjb/cps/cps.yaml | 14 -- ...caegen2-services-docker-python-subprojects.yaml | 5 - jjb/sdc/sdc.yaml | 16 -- jjb/wss-unified-agent.config | 236 --------------------- 17 files changed, 441 deletions(-) delete mode 100644 jjb/wss-unified-agent.config diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml index 4af6105e2..863133952 100644 --- a/jjb/aai/aai-aai-common.yaml +++ b/jjb/aai/aai-aai-common.yaml @@ -104,17 +104,3 @@ files: 'Dockerfiles/aai-common/**' build-node: ubuntu1804-docker-8c-8g java-version: openjdk8 - -- project: - name: 'aai-aai-common-whitesource' - project-name: 'aai-aai-common' - build-node: ubuntu1804-docker-8c-8g - jobs: - - gerrit-whitesource-scan - mvn-params: '-P spring-boot-2-1' - mvn-settings: 'aai-aai-common-settings' - wss-product-name: 'aai' - mvn-clean-install: true - project: 'aai/aai-common' - branch: master - java-version: openjdk8 diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml index aade6d39b..8ae66c627 100644 --- a/jjb/aai/aai-model-loader.yaml +++ b/jjb/aai/aai-model-loader.yaml @@ -81,17 +81,3 @@ build-node: centos8-builder-2c-1g project: aai/model-loader branch: master - -- project: - name: 'aai-model-loader-whitesource' - project-name: 'aai-model-loader' - build-node: ubuntu1804-docker-8c-8g - jobs: - - gerrit-whitesource-scan - mvn-settings: 'aai-model-loader-settings' - wss-product-name: 'aai' - mvn-clean-install: true - project: 'aai/model-loader' - branch: master - java-version: openjdk11 - mvn-version: 'mvn36' diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml index 378dd3449..19967716d 100644 --- a/jjb/aai/aai-resources.yaml +++ b/jjb/aai/aai-resources.yaml @@ -83,15 +83,3 @@ project: aai/resources branch: master java-version: openjdk8 - -- project: - name: 'aai-resources-whitesource' - project-name: 'aai-resources' - build-node: ubuntu1804-docker-8c-8g - jobs: - - gerrit-whitesource-scan - mvn-settings: 'aai-resources-settings' - wss-product-name: 'aai' - mvn-clean-install: true - project: 'aai/resources' - branch: master diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml index 125001144..a4550b2da 100644 --- a/jjb/aai/aai-sparky-be.yaml +++ b/jjb/aai/aai-sparky-be.yaml @@ -80,15 +80,3 @@ build-node: centos8-builder-2c-1g project: aai/sparky-be branch: master - -- project: - name: 'aai-sparky-be-whitesource' - project-name: 'aai-sparky-be' - build-node: ubuntu1804-docker-8c-8g - jobs: - - gerrit-whitesource-scan - mvn-settings: 'aai-sparky-be-settings' - wss-product-name: 'aai' - mvn-clean-install: true - project: 'aai/sparky-be' - branch: master diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml index 04f61ca02..b44259aac 100644 --- a/jjb/ccsdk/apps.yaml +++ b/jjb/ccsdk/apps.yaml @@ -114,16 +114,3 @@ build-node: centos8-builder-2c-1g project: ccsdk/apps branch: master - -- project: - name: ccsdk-apps-whitesource - project-name: ccsdk-apps - jobs: - - gerrit-whitesource-scan - java-version: openjdk11 - mvn-version: 'mvn38' - mvn-settings: 'ccsdk-apps-settings' - wss-product-name: ccsdk - mvn-clean-install: true - project: ccsdk/apps - branch: master diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml index 15f982536..06b721385 100644 --- a/jjb/ccsdk/cds.yaml +++ b/jjb/ccsdk/cds.yaml @@ -129,16 +129,3 @@ build-node: centos8-builder-2c-1g project: ccsdk/cds branch: master - -- project: - name: ccsdk-cds-whitesource - project-name: ccsdk-cds - jobs: - - gerrit-whitesource-scan - java-version: openjdk11 - mvn-version: 'mvn38' - mvn-settings: 'ccsdk-cds-settings' - wss-product-name: ccsdk - mvn-clean-install: true - project: ccsdk/cds - branch: master diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml index c0587420c..51039a60e 100644 --- a/jjb/ccsdk/distribution.yaml +++ b/jjb/ccsdk/distribution.yaml @@ -88,18 +88,3 @@ build-node: centos7-builder-2c-1g project: ccsdk/distribution branch: master - -- project: - name: ccsdk-distribution-whitesource - project-name: ccsdk-distribution - build-node: centos7-builder-4c-4g - jobs: - - gerrit-whitesource-scan: - java-opts: '-Xmx2048m' - java-version: openjdk11 - mvn-version: 'mvn38' - mvn-settings: 'ccsdk-distribution-settings' - wss-product-name: ccsdk - mvn-clean-install: true - project: ccsdk/distribution - branch: master diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml index 8fbe9b5f8..fe743924d 100644 --- a/jjb/ccsdk/features.yaml +++ b/jjb/ccsdk/features.yaml @@ -86,18 +86,3 @@ build-node: centos7-builder-2c-1g project: ccsdk/features branch: master - -- project: - name: ccsdk-features-whitesource - build-node: centos7-builder-4c-4g - project-name: ccsdk-features - jobs: - - gerrit-whitesource-scan - java-version: openjdk11 - mvn-version: 'mvn38' - mvn-settings: 'ccsdk-features-settings' - wss-product-name: ccsdk - mvn-clean-install: true - mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m' - project: ccsdk/features - branch: master diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml index 57f6853d6..c095d7c3d 100644 --- a/jjb/ccsdk/parent.yaml +++ b/jjb/ccsdk/parent.yaml @@ -74,16 +74,3 @@ build-node: centos7-builder-2c-1g project: ccsdk/parent branch: master - -- project: - name: ccsdk-parent-whitesource - project-name: ccsdk-parent - jobs: - - gerrit-whitesource-scan - java-version: openjdk11 - mvn-version: 'mvn38' - mvn-settings: 'ccsdk-parent-settings' - wss-product-name: ccsdk - mvn-clean-install: true - project: ccsdk/parent - branch: master diff --git a/jjb/ccsdk/sli.yaml b/jjb/ccsdk/sli.yaml index bc4b956ce..57dd9c581 100644 --- a/jjb/ccsdk/sli.yaml +++ b/jjb/ccsdk/sli.yaml @@ -84,16 +84,3 @@ build-node: centos7-builder-2c-1g project: ccsdk/sli branch: master - -- project: - name: ccsdk-sli-whitesource - project-name: ccsdk-sli - jobs: - - gerrit-whitesource-scan - java-version: openjdk11 - mvn-version: 'mvn38' - mvn-settings: 'ccsdk-sli-settings' - wss-product-name: ccsdk - mvn-clean-install: true - project: ccsdk/sli - branch: master diff --git a/jjb/ci-management/ci-management-views.yaml b/jjb/ci-management/ci-management-views.yaml index dfab26018..ff3a7a3ba 100644 --- a/jjb/ci-management/ci-management-views.yaml +++ b/jjb/ci-management/ci-management-views.yaml @@ -130,11 +130,3 @@ view-name: Verify-Jobs view-description: 'List of Verify jobs' view-regex: '^.*-verify-.*' - -- project: - name: WhiteSource - views: - - common-view - view-name: WhiteSource - view-description: 'List of WhiteSource jobs' - view-regex: '.*-whitesource-.*' diff --git a/jjb/cps/cps-cps-temporal.yaml b/jjb/cps/cps-cps-temporal.yaml index 86b26e71f..2e3234011 100644 --- a/jjb/cps/cps-cps-temporal.yaml +++ b/jjb/cps/cps-cps-temporal.yaml @@ -105,17 +105,3 @@ mvn-settings: 'cps-cps-temporal-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - -- project: - name: cps-cps-temporal-whitesource - project-name: cps-cps-temporal - jobs: - - gerrit-whitesource-scan - java-version: openjdk11 - mvn-version: mvn36 - mvn-settings: cps-cps-temporal-settings - wss-product-name: cps-cps-temporal - mvn-clean-install: true - project: cps/cps-temporal - branch: master - build-node: centos7-docker-8c-8g diff --git a/jjb/cps/cps-ncmp-dmi-plugin.yaml b/jjb/cps/cps-ncmp-dmi-plugin.yaml index 432041fef..0b8c3df42 100644 --- a/jjb/cps/cps-ncmp-dmi-plugin.yaml +++ b/jjb/cps/cps-ncmp-dmi-plugin.yaml @@ -108,17 +108,3 @@ mvn-settings: 'cps-ncmp-dmi-plugin-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - -- project: - name: cps-ncmp-dmi-plugin-whitesource - project-name: cps-ncmp-dmi-plugin - jobs: - - gerrit-whitesource-scan - java-version: openjdk11 - mvn-version: mvn36 - mvn-settings: cps-ncmp-dmi-plugin-settings - wss-product-name: cps-ncmp-dmi-plugin - mvn-clean-install: true - project: cps/ncmp-dmi-plugin - branch: master - build-node: centos7-docker-8c-8g diff --git a/jjb/cps/cps.yaml b/jjb/cps/cps.yaml index 0baf89618..6049052d7 100644 --- a/jjb/cps/cps.yaml +++ b/jjb/cps/cps.yaml @@ -107,17 +107,3 @@ mvn-settings: 'cps-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - -- project: - name: cps-whitesource - project-name: cps - jobs: - - gerrit-whitesource-scan - java-version: openjdk11 - mvn-version: 'mvn36' - mvn-settings: 'cps-settings' - wss-product-name: cps - mvn-clean-install: true - project: cps - branch: master - build-node: centos7-docker-8c-8g diff --git a/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml index 6cd4efab4..478c61e1f 100644 --- a/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml +++ b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml @@ -81,11 +81,6 @@ stream: kohn branch: kohn cron: '' - - gerrit-whitesource-scan: - build-timeout: 120 - submodule-timeout: 30 - java-opts: '-Xmx2048m' - mvn-pom: '{src-dir}/pom.xml' - gerrit-tox-sonar: # workaround because gerrit-tox-sonar doesn't support mvn-params/opts sonar-mvn-goal: '-f {src-dir}/pom.xml sonar:sonar' diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml index 64639a3ab..c5e2e0cb0 100644 --- a/jjb/sdc/sdc.yaml +++ b/jjb/sdc/sdc.yaml @@ -127,19 +127,3 @@ build-node: centos7-builder-2c-1g project: sdc branch: master - -- project: - name: 'sdc-whitesource' - project-name: 'sdc' - build-node: ubuntu1804-docker-8c-8g - jobs: - - gerrit-whitesource-scan: - build-timeout: 120 - submodule-timeout: 30 - java-opts: '-Xmx2048m' - mvn-settings: 'sdc-settings' - wss-product-name: 'sdc' - mvn-clean-install: true - project: 'sdc' - branch: master - java-version: openjdk11 diff --git a/jjb/wss-unified-agent.config b/jjb/wss-unified-agent.config deleted file mode 100644 index 4a9f091c7..000000000 --- a/jjb/wss-unified-agent.config +++ /dev/null @@ -1,236 +0,0 @@ -#################################################################### -# WhiteSource Unified-Agent configuration file -#################################################################### -########################################## -# GENERAL SCAN MODE: Files and Package Managers -########################################## - -checkPolicies=false -forceCheckAllDependencies=false -forceUpdate=false -forceUpdate.failBuildOnPolicyViolation=false -offline=false -#ignoreSourceFiles=true -#scanComment= -#updateInventory=false -#resolveAllDependencies=false -#failErrorLevel=ALL -#requireKnownSha1=false -#generateProjectDetailsJson=true -#generateScanReport=true -#scanReportTimeoutMinutes=10 -#excludeDependenciesFromNodes=.*commons-io.*,.*maven-model - -#projectPerFolder=true -#projectPerFolderIncludes= -#projectPerFolderExcludes= - -#wss.connectionTimeoutMinutes=60 -# Change the below URL to your WhiteSource server. -# Use the 'WhiteSource Server URL' which can be retrieved -# from your 'Profile' page on the 'Server URLs' panel. -# Then, add the '/agent' path to it. -wss.url=https://saas.whitesourcesoftware.com/agent - -#npm.resolveDependencies=false -#npm.ignoreSourceFiles=false -#npm.includeDevDependencies=true -#npm.runPreStep=true -#npm.ignoreNpmLsErrors=true -#npm.ignoreScripts=true -#npm.yarnProject=true -#npm.accessToken= -#npm.identifyByNameAndVersion=true - -#bower.resolveDependencies=false -#bower.ignoreSourceFiles=true -#bower.runPreStep=true - -#nuget.resolvePackagesConfigFiles=false -#nuget.resolveCsProjFiles=false -#nuget.resolveDependencies=false -#nuget.restoreDependencies=true -#nuget.preferredEnvironment= -#nuget.packagesDirectory= -#nuget.ignoreSourceFiles=true -#nuget.runPreStep=true -#nuget.resolveNuspecFiles=false - -#python.resolveDependencies=false -#python.ignoreSourceFiles=false -#python.ignorePipInstallErrors=true -#python.installVirtualenv=true -#python.resolveHierarchyTree=false -#python.requirementsFileIncludes=requirements.txt -#python.resolveSetupPyFiles=true -#python.runPipenvPreStep=true -#python.pipenvDevDependencies=true -#python.IgnorePipenvInstallErrors=true - -#maven.ignoredScopes=test provided -#maven.resolveDependencies=false -#maven.ignoreSourceFiles=true -#maven.aggregateModules=true -#maven.ignorePomModules=false -#maven.runPreStep=true -#maven.ignoreMvnTreeErrors=true -#maven.environmentPath= -#maven.m2RepositoryPath= - -#gradle.ignoredScopes= -#gradle.resolveDependencies=false -#gradle.runAssembleCommand=false -#gradle.runPreStep=true -#gradle.ignoreSourceFiles=true -#gradle.aggregateModules=true -#gradle.preferredEnvironment=wrapper -#gradle.localRepositoryPath= - -#paket.resolveDependencies=false -#paket.ignoredGroups= -#paket.ignoreSourceFiles=false -#paket.runPreStep=true -#paket.exePath= - -#go.resolveDependencies=false -#go.collectDependenciesAtRuntime=true -#go.dependencyManager= -#go.ignoreSourceFiles=true -#go.glide.ignoreTestPackages=false -#go.gogradle.enableTaskAlias=true - -#ruby.resolveDependencies = false -#ruby.ignoreSourceFiles = false -#ruby.installMissingGems = true -#ruby.runBundleInstall = true -#ruby.overwriteGemFile = true - -#sbt.resolveDependencies=false -#sbt.ignoreSourceFiles=true -#sbt.aggregateModules=true -#sbt.runPreStep=true -#sbt.targetFolder= - -#php.resolveDependencies=false -#php.runPreStep=true -#php.includeDevDependencies=true - -#html.resolveDependencies=false - -#cocoapods.resolveDependencies=false -#cocoapods.runPreStep=true -#cocoapods.ignoreSourceFiles=false - -#hex.resolveDependencies=false -#hex.runPreStep=true -#hex.ignoreSourceFiles=false -#hex.aggregateModules=true - -################################## -# Organization tokens: -################################## -apiKey= - -#userKey is required if WhiteSource administrator has enabled "Enforce user level access" option -#userKey= - -projectName= -projectVersion= -projectToken= - -productName= -productVersion= -productToken= -#updateType=APPEND -#requesterEmail=user@provider.com - -######################################################################################### -# Includes/Excludes Glob patterns - PLEASE USE ONLY ONE EXCLUDE LINE AND ONE INCLUDE LINE -######################################################################################### -includes=**/*.c **/*.cc **/*.cp **/*.cpp **/*.cxx **/*.c++ **/*.h **/*.hpp **/*.hxx **/*.go **/*.py - -#includes=**/*.m **/*.mm **/*.js **/*.php -#includes=**/*.jar -#includes=**/*.gem **/*.rb -#includes=**/*.dll **/*.cs **/*.nupkg -#includes=**/*.tgz **/*.deb **/*.gzip **/*.rpm **/*.tar.bz2 -#includes=**/*.zip **/*.tar.gz **/*.egg **/*.whl **/*.py - -## Exclude file extensions or specific directories by adding **/*. or **/** -excludes=**/*sources.jar **/*javadoc.jar - -case.sensitive.glob=false -followSymbolicLinks=true - -################################## -# Archive properties -################################## -#archiveExtractionDepth=2 -#archiveIncludes=**/*.war **/*.ear -#archiveExcludes=**/*sources.jar - -################################## -# Proxy settings -################################## -#proxy.host= -#proxy.port= -#proxy.user= -#proxy.pass= - -################################## -# SCM settings -################################## -#scm.type= -#scm.user= -#scm.pass= -#scm.ppk= -#scm.url= -#scm.branch= -#scm.tag= -#scm.npmInstall= -#scm.npmInstallTimeoutMinutes= -#scm.repositoriesFile= - -############################################## -# SCAN MODE: Linux package manager settings -############################################## -#scanPackageManager=true - -################################## -# SCAN MODE: Docker images -################################## -#docker.scanImages=true -#docker.includes=.*.* -#docker.excludes= -#docker.pull.enable=true -#docker.pull.images=.*.* -#docker.pull.maxImages=10 -#docker.pull.tags=.*.* -#docker.pull.digest= -#docker.delete.force=true -#docker.login.sudo=false - -#docker.aws.enable=true -#docker.aws.registryIds= - -#docker.azure.enable=true -#docker.azure.userName= -#docker.azure.userPassword= -#docker.azure.registryNames= - -################################## -# SCAN MODE: Docker containers -################################## -#docker.scanContainers=true -#docker.containerIncludes=.*.* -#docker.containerExcludes= - -################################ -# Serverless settings -################################ -#serverless.provider= -#serverless.scanFunctions=true -#serverless.includes= -#serverless.excludes= -#serverless.region= -#serverless.maxFunctions=10 -- 2.16.6