diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/externalapi/externalapi-nbi-csit.yaml | 14 | ||||
| -rw-r--r-- | jjb/global-templates-java.yaml | 1 | ||||
| -rw-r--r-- | jjb/policy/policy-docker.yaml | 28 | ||||
| -rw-r--r-- | jjb/policy/policy-drools-pdp.yaml | 1 | ||||
| -rw-r--r-- | jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml | 4 | ||||
| -rw-r--r-- | jjb/vnfsdk/vnfsdk-ice-python.yaml | 8 | ||||
| -rw-r--r-- | jjb/vnfsdk/vnfsdk-pkgtools-python.yaml | 4 | ||||
| -rw-r--r-- | jjb/vnfsdk/vnfsdk-refrepo.yaml | 2 |
8 files changed, 24 insertions, 38 deletions
diff --git a/jjb/externalapi/externalapi-nbi-csit.yaml b/jjb/externalapi/externalapi-nbi-csit.yaml new file mode 100644 index 000000000..8f15b48e8 --- /dev/null +++ b/jjb/externalapi/externalapi-nbi-csit.yaml @@ -0,0 +1,14 @@ +--- +- project: + name: externalapi-nbi-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'externalapi-nbi' + stream: 'master' + functionality: + - 'healthcheck': + trigger_jobs: + - '{project-name}-{stream}-release-java-daily-checkstyle' + robot-options: '' + branch: 'master' diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index a98457482..b1750d603 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -2169,6 +2169,7 @@ project-type: freestyle node: 'ubuntu1604-docker-8c-8g' + build-timeout: 120 properties: - infra-properties: diff --git a/jjb/policy/policy-docker.yaml b/jjb/policy/policy-docker.yaml deleted file mode 100644 index 0eb5d7f07..000000000 --- a/jjb/policy/policy-docker.yaml +++ /dev/null @@ -1,28 +0,0 @@ ---- -- project: - name: policy-docker - project-name: 'policy-docker-policy' - jobs: - - gerrit-maven-clm - - '{project-name}-{stream}-verify-scm-mvn-script': - mvn-goals: 'clean install prepare-package' - script: - !include-raw-escape: 'include-raw-docker-verify.sh' - - '{project-name}-{stream}-merge-scm-mvn-script': - mvn-goals: 'clean install prepare-package' - script: - !include-raw-escape: 'include-raw-docker-merge.sh' - - '{project-name}-{stream}-docker-java-version-shell-daily': - docker-pom: 'pom.xml' - mvn-goals: 'prepare-package' - script: - !include-raw-escape: 'include-raw-docker-release.sh' - - project: 'policy/docker' - stream: - - 'master': - branch: 'master' - mvn-settings: 'policy-docker-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml index fe1d7e2ab..030472a8a 100644 --- a/jjb/policy/policy-drools-pdp.yaml +++ b/jjb/policy/policy-drools-pdp.yaml @@ -11,7 +11,6 @@ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' script: !include-raw-escape: 'include-raw-docker-merge.sh' - - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' mvn-goals: 'clean deploy -B diff --git a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml index 1681403e1..aff445b5b 100644 --- a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml +++ b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml @@ -25,9 +25,9 @@ docker-pom: 'pom.xml' mvn-profile: 'docker' - project: - name: vnfsdk-dovetail-integration-sonar + name: vnfsdk-dovetail-integration-tox-sonar jobs: - - gerrit-maven-sonar + - gerrit-tox-sonar cron: 'H 11 * * *' build-node: ubuntu1604-builder-4c-4g project: 'vnfsdk/dovetail-integration' diff --git a/jjb/vnfsdk/vnfsdk-ice-python.yaml b/jjb/vnfsdk/vnfsdk-ice-python.yaml index 8d76712e1..ee5b5adf8 100644 --- a/jjb/vnfsdk/vnfsdk-ice-python.yaml +++ b/jjb/vnfsdk/vnfsdk-ice-python.yaml @@ -38,9 +38,9 @@ docker-pom: 'docker/pom.xml' mvn-profile: 'docker' - project: - name: vnfsdk-ice-validation-scripts-sonar + name: vnfsdk-ice-validation-scripts-tox-sonar jobs: - - gerrit-maven-sonar + - gerrit-tox-sonar cron: 'H 11 * * *' mvn-params: '-f validation-scripts/pom.xml' build-node: ubuntu1604-builder-4c-4g @@ -51,9 +51,9 @@ mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - project: - name: vnfsdk-ice-ice-server-sonar + name: vnfsdk-ice-ice-server-tox-sonar jobs: - - gerrit-maven-sonar + - gerrit-tox-sonar cron: 'H 11 * * *' mvn-params: '-f ice-server/pom.xml' build-node: ubuntu1604-builder-4c-4g diff --git a/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml b/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml index 5479abe58..e68ea1d7e 100644 --- a/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml +++ b/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml @@ -20,9 +20,9 @@ - '{project-name}-{stream}-{subproject}-verify-python' - '{project-name}-{subproject}-python-staging-{stream}' - project: - name: vnfsdk-pkgtools-sonar + name: vnfsdk-pkgtools-tox-sonar jobs: - - gerrit-maven-sonar + - gerrit-tox-sonar cron: 'H 11 * * *' build-node: ubuntu1604-builder-4c-4g project: 'vnfsdk/pkgtools' diff --git a/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml index 83081708e..30c3e0750 100644 --- a/jjb/vnfsdk/vnfsdk-refrepo.yaml +++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml @@ -10,7 +10,7 @@ - '{project-name}-{stream}-aai-docker-java-daily': pom: 'vnfmarket-be/deployment/docker/docker-refrepo/pom.xml' mvn-goals: 'docker:build' - docker-image-name: 'onap/refrepo' + docker-image-name: 'onap/vnfsdk/refrepo' - '{project-name}-{stream}-docker-version-java-daily': docker-pom: 'vnfmarket-be/deployment/docker/docker-postgres/pom.xml' mvn-profile: 'docker' |