diff options
| -rw-r--r-- | jjb/appc/appc-csit.yaml | 16 | ||||
| -rw-r--r-- | jjb/appc/appc-master.yaml | 78 | ||||
| -rw-r--r-- | jjb/externalapi/externalapi-nbi-csit.yaml | 14 | ||||
| -rw-r--r-- | jjb/externalapi/externalapi-nbi.yaml | 94 | ||||
| -rw-r--r-- | jjb/testsuite/testsuite-python-testing-utils.yaml | 6 |
5 files changed, 3 insertions, 205 deletions
diff --git a/jjb/appc/appc-csit.yaml b/jjb/appc/appc-csit.yaml deleted file mode 100644 index 0b3324a35..000000000 --- a/jjb/appc/appc-csit.yaml +++ /dev/null @@ -1,16 +0,0 @@ ---- -- project: - name: appc-csit - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'appc' - disabled: true - recipients: 'tc012c@att.com' - stream: - - 'master': - branch: 'master' - functionality: - - 'healthcheck': - trigger_jobs: - robot-options: '' diff --git a/jjb/appc/appc-master.yaml b/jjb/appc/appc-master.yaml deleted file mode 100644 index 513126b17..000000000 --- a/jjb/appc/appc-master.yaml +++ /dev/null @@ -1,78 +0,0 @@ ---- -- project: - name: appc-master - project-name: 'appc' - jobs: - - '{project-name}-{stream}-verify-java': - build-node: ubuntu1804-docker-8c-8g - mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m" - java-opts: "-Xmx4000m -XX:MaxPermSize=256m" - - '{project-name}-{stream}-merge-java': - build-node: ubuntu1804-docker-8c-8g - mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m" - java-opts: "-Xmx4000m -XX:MaxPermSize=256m" - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-docker-8c-8g - maven-versions-plugin: true - mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m" - java-opts: "-Xmx4000m -XX:MaxPermSize=256m" - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m" - java-opts: "-Xmx4000m -XX:MaxPermSize=256m" - - project: 'appc' - stream: - - 'master': - branch: 'master' - - 'frankfurt': - branch: 'frankfurt' - mvn-settings: 'appc-settings' - maven-version: "mvn35" - files: '**' - archive-artifacts: '' - build-node: ubuntu1804-docker-8c-8g - -- project: - name: appc-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: ubuntu1804-docker-8c-8g - project: 'appc' - project-name: 'appc' - branch: 'master' - mvn-settings: 'appc-settings' - maven-version: "mvn35" - mvn-goals: 'clean install' - mvn-opts: '-Xmx4096m' - -- project: - name: appc-clm - jobs: - - gerrit-maven-clm: - mvn-params: '-DskipTests' - build-timeout: 60 - build-node: ubuntu1804-docker-8c-8g - mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m" - nexus-iq-namespace: 'onap-' - project: 'appc' - project-name: 'appc' - branch: 'master' - mvn-settings: 'appc-settings' - maven-version: "mvn35" - -- project: - name: appc-info - project-name: appc - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: appc - branch: master diff --git a/jjb/externalapi/externalapi-nbi-csit.yaml b/jjb/externalapi/externalapi-nbi-csit.yaml deleted file mode 100644 index e5adc35af..000000000 --- a/jjb/externalapi/externalapi-nbi-csit.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -- project: - name: externalapi-nbi-csit - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'externalapi-nbi' - recipients: 'adrian.osullivan@huawei.com' - stream: 'master' - functionality: - - 'healthcheck': - trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle' - robot-options: '' - branch: 'master' diff --git a/jjb/externalapi/externalapi-nbi.yaml b/jjb/externalapi/externalapi-nbi.yaml deleted file mode 100644 index 6bda3cba0..000000000 --- a/jjb/externalapi/externalapi-nbi.yaml +++ /dev/null @@ -1,94 +0,0 @@ ---- -- project: - name: externalapi-project-view - project-name: externalapi - views: - - project-view - -- project: - name: externalapi-nbi - project-name: 'externalapi-nbi' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-docker-8c-8g - maven-versions-plugin: true - mvn-params: '-Dmaven.test.skip=true' - - gerrit-maven-docker-stage: - build-node: ubuntu1804-docker-8c-8g - maven-versions-plugin: true - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - mvn-params: '-Dmaven.test.skip=true -P docker' - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - project: 'externalapi/nbi' - stream: - - 'master': - branch: 'master' - mvn-settings: 'externalapi-nbi-settings' - java-version: openjdk11 - files: '**' - archive-artifacts: '' - build-node: ubuntu1804-builder-4c-4g - -- project: - name: externalapi-nbi-arm64 - project-name: 'externalapi-nbi-arm64' - jobs: - - '{project-name}-{stream}-docker-version-java-daily': - docker-pom: 'pom.xml' - mvn-profile: 'docker' - mvn-params: '-Dmaven.test.skip=true' - build-node: 'ubuntu1804-docker-arm64-4c-2g' - project: 'externalapi/nbi' - stream: - - 'master': - branch: 'master' - mvn-settings: 'externalapi-nbi-settings' - files: '**' - archive-artifacts: '' - -- project: - name: externalapi-nbi-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: 'externalapi/nbi' - project-name: 'externalapi-nbi' - stream: - - 'master': - branch: 'master' - mvn-settings: 'externalapi-nbi-settings' - java-version: openjdk11 - -- project: - name: externalapi-nbi-sonar - jobs: - - gerrit-maven-sonar-prescan-script - 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-builder-4c-4g - project: 'externalapi/nbi' - project-name: 'externalapi-nbi' - branch: 'master' - mvn-settings: 'externalapi-nbi-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - java-version: openjdk11 - sonar-prescan-script: !include-raw-escape: ../ubuntu-latest-nodejs.sh - -- project: - name: externalapi-nbi-info - project-name: externalapi-nbi - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: externalapi/nbi - branch: master diff --git a/jjb/testsuite/testsuite-python-testing-utils.yaml b/jjb/testsuite/testsuite-python-testing-utils.yaml index fd84d7e8a..e4983fdc2 100644 --- a/jjb/testsuite/testsuite-python-testing-utils.yaml +++ b/jjb/testsuite/testsuite-python-testing-utils.yaml @@ -17,7 +17,7 @@ mvn-settings: 'testsuite-python-testing-utils-settings' files: '**' archive-artifacts: '' - build-node: 'centos7-builder-4c-4g' + build-node: 'ubuntu1804-builder-4c-4g' - project: name: testsuite-python-testing-utils-verify @@ -27,7 +27,7 @@ - 'master': branch: 'master' mvn-settings: 'testsuite-python-testing-utils-settings' - build-node: 'centos7-builder-4c-4g' + build-node: 'ubuntu1804-builder-4c-4g' subproject: - 'robotframework-onap': path: 'robotframework-onap' @@ -40,6 +40,6 @@ project-name: testsuite-python-testing-utils jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: ubuntu1804-builder-4c-4g project: testsuite/python-testing-utils branch: master |