diff options
| m--------- | global-jjb | 0 | ||||
| -rw-r--r-- | jjb/aai/aai-graphgraph.yaml | 7 | ||||
| -rw-r--r-- | jjb/global-defaults.yaml | 1 | ||||
| -rw-r--r-- | jjb/global-templates-docker.yaml | 7 | ||||
| -rw-r--r-- | jjb/global-templates-helm.yaml | 4 | ||||
| -rw-r--r-- | jjb/onap-jjb/onap-pypi-template.yaml | 2 | ||||
| -rw-r--r-- | jjb/optf/optf-cmso.yaml | 4 | ||||
| -rw-r--r-- | jjb/optf/optf-has.yaml | 1 | ||||
| -rw-r--r-- | jjb/optf/optf-osdf.yaml | 1 |
9 files changed, 21 insertions, 6 deletions
diff --git a/global-jjb b/global-jjb -Subproject bfea76c9bead88faf10a3ad41ae98ad741ac1b9 +Subproject f56fb3983c20cf5256a544350ac7f7eced1a004 diff --git a/jjb/aai/aai-graphgraph.yaml b/jjb/aai/aai-graphgraph.yaml index b1b4c7a42..31cedd15b 100644 --- a/jjb/aai/aai-graphgraph.yaml +++ b/jjb/aai/aai-graphgraph.yaml @@ -11,6 +11,13 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-docker-java-daily': + docker-pom: 'pom.xml' + mvn-profile: 'docker' + mvn-params: '-Dmaven.test.skip=true' + build-node: ubuntu1604-docker-2c-4g + project: 'aai/graphgraph' stream: - 'master': diff --git a/jjb/global-defaults.yaml b/jjb/global-defaults.yaml index e43a8a29f..b86e65374 100644 --- a/jjb/global-defaults.yaml +++ b/jjb/global-defaults.yaml @@ -47,6 +47,7 @@ # git submodule attributes submodule-recursive: true + submodule-disable: false # Jenkins jenkins-ssh-credential: onap-jenkins-ssh diff --git a/jjb/global-templates-docker.yaml b/jjb/global-templates-docker.yaml index db3d4cfc7..1c8242f32 100644 --- a/jjb/global-templates-docker.yaml +++ b/jjb/global-templates-docker.yaml @@ -24,6 +24,7 @@ # Default to LF standard 'snapshots' docker registry docker_registry: '$DOCKER_REGISTRY:10003' docker_tag: 'latest' + submodule-disable: false submodule-timeout: 10 ##################### @@ -280,6 +281,7 @@ branch: '$GERRIT_BRANCH' submodule-recursive: true submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default builders: @@ -340,6 +342,7 @@ branch: '$GERRIT_BRANCH' submodule-recursive: true submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default builders: @@ -560,6 +563,7 @@ branch: '$GERRIT_BRANCH' submodule-recursive: true submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default builders: @@ -620,6 +624,7 @@ branch: '$GERRIT_BRANCH' submodule-recursive: true submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default builders: @@ -677,6 +682,7 @@ branch: '$GERRIT_BRANCH' submodule-recursive: true submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default builders: @@ -729,6 +735,7 @@ branch: '$GERRIT_BRANCH' submodule-recursive: true submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default builders: diff --git a/jjb/global-templates-helm.yaml b/jjb/global-templates-helm.yaml index f5c6bcde4..12ce9a383 100644 --- a/jjb/global-templates-helm.yaml +++ b/jjb/global-templates-helm.yaml @@ -17,6 +17,7 @@ git-url: '$GIT_URL/$PROJECT' post_build_script: '' pre_build_script: '' + submodule-disable: false submodule-recursive: true submodule-timeout: 10 @@ -129,6 +130,7 @@ branch: '$GERRIT_BRANCH' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default triggers: @@ -168,6 +170,7 @@ branch: '$GERRIT_BRANCH' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default triggers: @@ -272,6 +275,7 @@ branch: '$GERRIT_BRANCH' submodule-recursive: true submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default builders: diff --git a/jjb/onap-jjb/onap-pypi-template.yaml b/jjb/onap-jjb/onap-pypi-template.yaml index e5266036a..9de048cc0 100644 --- a/jjb/onap-jjb/onap-pypi-template.yaml +++ b/jjb/onap-jjb/onap-pypi-template.yaml @@ -20,6 +20,7 @@ - compare-type: ANT pattern: '**' + submodule-disable: false submodule-timeout: 10 ##################### @@ -52,6 +53,7 @@ branch: '$GERRIT_BRANCH' submodule-recursive: true submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default wrappers: diff --git a/jjb/optf/optf-cmso.yaml b/jjb/optf/optf-cmso.yaml index 8b495ff33..5b240f439 100644 --- a/jjb/optf/optf-cmso.yaml +++ b/jjb/optf/optf-cmso.yaml @@ -17,10 +17,6 @@ mvn_properties: - docker.pull.registry=nexus3.onap.org:10001 - docker.push.registry=nexus3.onap.org:10003 - - '{project-name}-{stream}-release-java-daily-checkstyle': - setVersion: 'DoSetVersion' - mvn_properties: - - docker.pull.registry=nexus3.onap.org:10001 - '{project-name}-{stream}-docker-java-properties-daily': setVersion: 'DoSetVersion' docker-pom: 'pom.xml' diff --git a/jjb/optf/optf-has.yaml b/jjb/optf/optf-has.yaml index 314ec3327..50a8035f8 100644 --- a/jjb/optf/optf-has.yaml +++ b/jjb/optf/optf-has.yaml @@ -21,7 +21,6 @@ sign-artifacts: true build-node: centos7-docker-8c-8g maven-versions-plugin: true - - '{project-name}-{stream}-{subproject}-release-version-java-daily' files: '**' archive-artifacts: '' build-node: 'ubuntu1604-builder-4c-4g' diff --git a/jjb/optf/optf-osdf.yaml b/jjb/optf/optf-osdf.yaml index 1908941c4..094985082 100644 --- a/jjb/optf/optf-osdf.yaml +++ b/jjb/optf/optf-osdf.yaml @@ -20,7 +20,6 @@ sign-artifacts: true build-node: centos7-docker-8c-8g maven-versions-plugin: true - - '{project-name}-{stream}-{subproject}-release-version-java-daily' files: '**' archive-artifacts: '' build-node: 'ubuntu1604-builder-4c-4g' |