From: Bengt Thuree Date: Thu, 28 Apr 2022 10:13:31 +0000 (+0000) Subject: Merge "Fix: Use oom-create-netrc for helm" X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=613c010810f213571e499ecd37f70ca5d534a096;hp=459f06118f1b2b7f9ab2e54c8fd8298d5d209aa4;p=ci-management.git Merge "Fix: Use oom-create-netrc for helm" --- diff --git a/global-jjb b/global-jjb index 18d90a9e0..ff3ea7c20 160000 --- a/global-jjb +++ b/global-jjb @@ -1 +1 @@ -Subproject commit 18d90a9e0b74515b6aa2ac8fc4a17b9d98a7680e +Subproject commit ff3ea7c20d4ea68079502f20efa885b298bc6cb2 diff --git a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml deleted file mode 100644 index a36be286d..000000000 --- a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml +++ /dev/null @@ -1,47 +0,0 @@ ---- -- project: - name: dcaegen2-platform-blueprints - project-name: 'dcaegen2-platform-blueprints' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - project: 'dcaegen2/platform/blueprints' - stream: - - 'master': - branch: 'master' - - 'istanbul': - branch: 'istanbul' - - 'honolulu': - branch: 'honolulu' - mvn-settings: 'dcaegen2-platform-blueprints-settings' - # due to a strange macro / variable translation problem this needs - # to be passed as a string block to properly get the properties - # correctly defined in the job - maven-deploy-properties: | - deployAtEnd=true - files: '**' - archive-artifacts: '' - build-node: 'ubuntu1804-docker-8c-8g' - -- project: - name: dcaegen2-platform-blueprints-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: dcaegen2/platform/blueprints - build-node: ubuntu1804-docker-8c-8g - project-name: 'dcaegen2-platform-blueprints' - branch: 'master' - mvn-settings: 'dcaegen2-platform-blueprints-settings' - -- project: - name: dcaegen2-platform-blueprints-info - project-name: dcaegen2-platform-blueprints - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: dcaegen2/platform/blueprints - branch: master diff --git a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml deleted file mode 100644 index ff838ddcd..000000000 --- a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml +++ /dev/null @@ -1,66 +0,0 @@ ---- -- project: - name: dcaegen2-platform-configbinding - # git repo - project: dcaegen2/platform/configbinding - # jenkins job prefix - project-name: dcaegen2-platform-configbinding - # push credentials - mvn-settings: dcaegen2-platform-configbinding-settings - # due to a strange macro / variable translation problem this needs - # to be passed as a string block to properly get the properties - # correctly defined in the job - maven-deploy-properties: | - deployAtEnd=true - files: '**' - archive-artifacts: '' - build-node: ubuntu1804-docker-8c-8g - # used by tox-install.sh to specify the interpreter used to install tox - python-version: python3 - jobs: - # clm and tox - - '{project-name}-python-jobs' - # build docker image - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - gerrit-release-verify: - build-node: centos7-docker-8c-8g - - gerrit-release-merge: - build-node: centos7-docker-8c-8g - stream: - - master: - branch: master - - istanbul: - branch: istanbul - - honolulu: - branch: honolulu - -- project: - name: dcaegen2-platform-configbinding-sonar - jobs: - - gerrit-tox-sonar - sonarcloud: true - sonarcloud-project-organization: '{sonarcloud_project_organization}' - sonarcloud-api-token: '{sonarcloud_api_token}' - sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' - sonar-mvn-goal: '{sonar_mvn_goal}' - cron: '@daily' - build-node: ubuntu1804-docker-8c-8g - project: 'dcaegen2/platform/configbinding' - project-name: 'dcaegen2-platform-configbinding' - branch: 'master' - # used by tox-install.sh to specify the interpreter used to install tox - python-version: python3 - mvn-settings: 'dcaegen2-platform-configbinding-settings' - mvn-goals: 'clean test' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - - -- project: - name: dcaegen2-platform-configbinding-info - project: dcaegen2/platform/configbinding - project-name: dcaegen2-platform-configbinding - branch: master - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml deleted file mode 100644 index e50fc887c..000000000 --- a/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml +++ /dev/null @@ -1,55 +0,0 @@ ---- -- project: - name: dcaegen2-platform-mod-bpgenerator - project: 'dcaegen2/platform' - project-name: 'dcaegen2-platform-mod' - jobs: - - '{project-name}-{stream}-{subproject}-verify-java' - - '{project-name}-{stream}-{subproject}-merge-java' - - gerrit-maven-stage: - project-name: dcaegen2-platform-mod-bpgenerator - sign-artifacts: true - build-node: centos7-builder-4c-4g - maven-versions-plugin: true - version-properties-file: 'mod/bpgenerator/version.properties' - mvn-pom: 'mod/bpgenerator/pom.xml' - mvn-params: '-f mod/bpgenerator/pom.xml' - pattern: 'mod/bpgenerator/**' - subproject: - - 'bpgenerator': - pom: 'mod/bpgenerator/pom.xml' - pattern: 'mod/bpgenerator/**' - stream: - - 'master': - branch: 'master' - - 'istanbul': - branch: 'istanbul' - - 'honolulu': - branch: 'honolulu' - java-version: openjdk11 - mvn-settings: 'dcaegen2-platform-settings' - maven-deploy-properties: | - deployAtEnd=true - files: '**' - archive-artifacts: '' - build-node: 'ubuntu1804-docker-8c-8g' - -- project: - name: dcaegen2-platform-mod-bpgenerator-sonar - java-version: openjdk11 - jobs: - - gerrit-maven-sonar - sonarcloud: true - sonarcloud-project-organization: '{sonarcloud_project_organization}' - sonarcloud-api-token: '{sonarcloud_api_token}' - sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' - sonar-mvn-goal: '{sonar_mvn_goal}' - cron: '@daily' - build-node: ubuntu1804-docker-8c-8g - project: 'dcaegen2/platform' - project-name: 'dcaegen2-platform-mod-bpgenerator' - branch: 'master' - mvn-settings: 'dcaegen2-platform-settings' - mvn-params: '-f mod/bpgenerator/pom.xml' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml deleted file mode 100644 index 74dc768eb..000000000 --- a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml +++ /dev/null @@ -1,67 +0,0 @@ ---- -- project: - name: dcaegen2-platform-plugins - project-name: 'dcaegen2-platform-plugins' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - project: 'dcaegen2/platform/plugins' - stream: - - 'master': - branch: 'master' - python-version: python3 - - 'honolulu': - branch: 'honolulu' - python-version: python3 - - 'istanbul': - branch: 'istanbul' - python-version: python3 - mvn-settings: 'dcaegen2-platform-plugins-settings' - # due to a strange macro / variable translation problem this needs - # to be passed as a string block to properly get the properties - # correctly defined in the job - maven-deploy-properties: | - deployAtEnd=true - files: '**' - archive-artifacts: '' - build-node: 'centos7-redis-4c-4g' - -- project: - name: dcaegen2-platform-plugins-sonar - jobs: - - gerrit-maven-sonar - sonarcloud: true - sonarcloud-project-organization: '{sonarcloud_project_organization}' - sonarcloud-api-token: '{sonarcloud_api_token}' - sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' - sonar-mvn-goal: '{sonar_mvn_goal}' - cron: '@daily' - build-node: centos7-redis-4c-4g - project: 'dcaegen2/platform/plugins' - project-name: 'dcaegen2-platform-plugins' - branch: 'master' - mvn-settings: 'dcaegen2-platform-plugins-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - -- project: - name: dcaegen2-platform-plugins-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: dcaegen2/platform/plugins - build-node: centos7-redis-4c-4g - project-name: 'dcaegen2-platform-plugins' - branch: 'master' - mvn-settings: 'dcaegen2-platform-plugins-settings' - -- project: - name: dcaegen2-platform-plugins-info - project-name: dcaegen2-platform-plugins - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: dcaegen2/platform/plugins - branch: master diff --git a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-csit.yaml b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-csit.yaml deleted file mode 100644 index f70c722da..000000000 --- a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-csit.yaml +++ /dev/null @@ -1,15 +0,0 @@ -- project: - name: dcaegen2-bbs-event-processor-csit - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'dcaegen2-services-bbs-event-processor' - recipients: 'vv770d@att.com stavros.kanarakis@nokia.com piotr.wielebski@nokia.com kornel.janiak@nokia.com' - stream: - - 'master': - branch: 'master' - functionality: - - 'bbs-testsuites': - trigger_jobs: - - 'dcaegen2-services-{stream}-bbs-event-processor-merge-java' - robot-options: ''