Merge "Remove stage-site-java template"
authorJessica Wagantall <jwagantall@linuxfoundation.org>
Tue, 13 Mar 2018 20:35:25 +0000 (20:35 +0000)
committerGerrit Code Review <gerrit@onap.org>
Tue, 13 Mar 2018 20:35:25 +0000 (20:35 +0000)
1  2 
jjb/logging-analytics/logging-analytics.yaml
jjb/music/music.yaml

        - '{project-name}-{stream}-docker-version-java-daily':
            docker-pom: 'pom.xml'
            mvn-profile: 'docker'
-       - '{project-name}-{stream}-stage-site-java':
-           site-pom: 'pom.xml'
-           trigger-job: '{project-name}-{stream}-release-version-java-daily'
      project: 'logging-analytics'
      stream:
        - 'master':
      mvn-settings: 'logging-analytics-settings'
      mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 +- project:
 +    name: logging-analytics-pylog
 +    project-name: 'logging-analytics-pylog'
 +    project: 'logging-analytics'
 +    python-version: python3
 +    stream:
 +      - 'master':
 +          branch: 'master'
 +    mvn-settings: 'logging-analytics-settings'
 +    subproject:
 +      - 'pylog':
 +          pom: 'pylog/pom.xml'
 +          pattern: 'pylog/**'
 +          tox-dir: pylog/
 +          tox-envs: ''
 +    jobs:
 +      - '{project-name}-{stream}-{subproject}-verify-java'
 +      - '{project-name}-{stream}-{subproject}-merge-java'
 +      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
 +      - '{project-name}-{subproject}-python-staging-{stream}'
 +      - '{project-name}-{subproject}-python-release-{stream}'
 +    files: '**'
 +    archive-artifacts: ''
 +    build-node: ubuntu1604-basebuild-4c-4g
 +- project:
 +    name: logging-analytics-pylog-python
 +    project-name: 'logging-analytics-pylog'
 +    project: 'logging-analytics'
 +    stream:
 +      - 'master':
 +          branch: 'master'
 +    mvn-settings: 'logging-analytics-settings'
 +    build-node: 'ubuntu1604-basebuild-4c-4g'
 +    subproject:
 +      - 'pylog':
 +          path: 'pylog'
 +          pattern: 'pylog/**'
 +    jobs:
 +      - '{project-name}-{stream}-{subproject}-verify-python'
diff --combined jjb/music/music.yaml
@@@ -3,18 -3,13 +3,13 @@@
      name: music
      project-name: 'music'
      jobs:
 -      - gerrit-maven-clm:
 +      - gerrit-maven-clm
        - '{project-name}-{stream}-verify-java'
        - '{project-name}-{stream}-merge-java'
        - '{project-name}-{stream}-release-version-java-daily'
        - '{project-name}-{stream}-docker-version-java-daily':
            docker-pom: 'pom.xml'
            mvn-profile: docker
-       - '{project-name}-{stream}-stage-site-java':
-           site-pom: 'pom.xml'
-           trigger-job: '{project-name}-{stream}-release-version-java-daily'
-           build-node: 'ubuntu1604-basebuild-8c-8g'
      project: 'music'
      stream:
        - 'master':