diff options
| -rw-r--r-- | jjb/externalapi/externalapi-nbi-csit.yaml | 2 | ||||
| -rw-r--r-- | jjb/global-templates-java.yaml | 1 | ||||
| -rw-r--r-- | jjb/oparent/oparent.yaml | 7 | ||||
| -rw-r--r-- | jjb/policy/policy-docker.yaml | 28 |
4 files changed, 2 insertions, 36 deletions
diff --git a/jjb/externalapi/externalapi-nbi-csit.yaml b/jjb/externalapi/externalapi-nbi-csit.yaml index 40a4663af..8f15b48e8 100644 --- a/jjb/externalapi/externalapi-nbi-csit.yaml +++ b/jjb/externalapi/externalapi-nbi-csit.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' - project-name: 'externalapi' + project-name: 'externalapi-nbi' stream: 'master' functionality: - 'healthcheck': 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/oparent/oparent.yaml b/jjb/oparent/oparent.yaml index 58d5f31be..4d15713d4 100644 --- a/jjb/oparent/oparent.yaml +++ b/jjb/oparent/oparent.yaml @@ -2,15 +2,8 @@ - project: name: oparent project-name: 'oparent' - subproject: - - 'oparent-odlparent': - pom: 'oparent-odlparent/pom.xml' - pattern: 'oparent-odlparent/**' jobs: - gerrit-maven-clm - - '{project-name}-{stream}-{subproject}-verify-java' - - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-{stream}-{subproject}-release-version3-java-daily' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' 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 |