diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/ci-management/ci-management-packer-jobs.yaml | 3 | ||||
| -rw-r--r-- | jjb/dcaegen2/dcaegen2-collectors-restconf-csit.yaml | 14 | ||||
| -rw-r--r-- | jjb/global-templates-java.yaml | 3 | ||||
| -rw-r--r-- | jjb/music/music-trigger.yaml | 31 | ||||
| -rw-r--r-- | jjb/music/music.yaml | 2 | ||||
| -rw-r--r-- | jjb/optf/optf-osdf.yaml | 6 | ||||
| -rw-r--r-- | jjb/sdnc/sdnc-csit.yaml | 2 | ||||
| -rw-r--r-- | jjb/wss-unified-agent.config | 2 |
8 files changed, 17 insertions, 46 deletions
diff --git a/jjb/ci-management/ci-management-packer-jobs.yaml b/jjb/ci-management/ci-management-packer-jobs.yaml index d812804f7..f4f46f3ca 100644 --- a/jjb/ci-management/ci-management-packer-jobs.yaml +++ b/jjb/ci-management/ci-management-packer-jobs.yaml @@ -14,10 +14,8 @@ platforms: - centos-7 - - centos-7-arm64 - ubuntu-16.04 - ubuntu-16.04-arm64 - - ubuntu-18.04-arm64 templates: builder - project: @@ -36,7 +34,6 @@ platforms: - ubuntu-16.04 - ubuntu-16.04-arm64 - - ubuntu-18.04-arm64 templates: docker - project: diff --git a/jjb/dcaegen2/dcaegen2-collectors-restconf-csit.yaml b/jjb/dcaegen2/dcaegen2-collectors-restconf-csit.yaml new file mode 100644 index 000000000..5720a64dc --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-collectors-restconf-csit.yaml @@ -0,0 +1,14 @@ +- project: + name: dcaegen2-collectors-restconf-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'dcaegen2-collectors-restconf' + stream: + - 'master': + branch: 'master' + functionality: + - 'testsuites': + trigger_jobs: + - '{project-name}-{stream}-merge-java' + robot-options: '' diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index 70d8c097e..c7fe3cf80 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -490,6 +490,7 @@ project-type: freestyle node: '{build-node}' disabled: '{disabled}' + version-properties: 'version.properties' maven-deploy-properties: properties: - infra-properties: @@ -529,7 +530,7 @@ settings-file: '{mvn-settings}' - inject: - properties-file: version.properties + properties-file: '{version-properties}' - maven-set-release-version: maven-version: '{maven-version}' mvn-settings: '{mvn-settings}' diff --git a/jjb/music/music-trigger.yaml b/jjb/music/music-trigger.yaml deleted file mode 100644 index 105dedd25..000000000 --- a/jjb/music/music-trigger.yaml +++ /dev/null @@ -1,31 +0,0 @@ ---- -- project: - name: music-trigger - project-name: 'music' - subproject: - - 'music-trigger': - pom: 'musictrigger/pom.xml' - pattern: 'musictrigger/**' - jobs: - - '{project-name}-{stream}-{subproject}-verify-java' - - '{project-name}-{stream}-{subproject}-merge-java' - project: 'music' - stream: - - 'trigger-casablanca': - branch: 'casablanca' - mvn-settings: 'music-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g - - -- project: - name: music-trigger-clm - jobs: - - gerrit-maven-clm: - mvn-params: '-f musictrigger/pom.xml assembly:single' - nexus-iq-namespace: 'onap-' - project: music - project-name: 'music-trigger' - branch: 'master' - mvn-settings: 'music-settings' diff --git a/jjb/music/music.yaml b/jjb/music/music.yaml index 33fbeaac9..129ece3ed 100644 --- a/jjb/music/music.yaml +++ b/jjb/music/music.yaml @@ -23,8 +23,6 @@ branch: 'master' - 'casablanca': branch: 'casablanca' - - 'dev-cassandra-only': - branch: 'dev-cassandra-only' mvn-settings: 'music-settings' files: '**' archive-artifacts: '' diff --git a/jjb/optf/optf-osdf.yaml b/jjb/optf/optf-osdf.yaml index 87af5100a..27d6fcec1 100644 --- a/jjb/optf/optf-osdf.yaml +++ b/jjb/optf/optf-osdf.yaml @@ -6,8 +6,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' mvn-settings: 'optf-osdf-settings' subproject: - 'osdf': @@ -30,8 +28,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' mvn-settings: 'optf-osdf-settings' subproject: - 'osdf': @@ -77,8 +73,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' mvn-settings: 'optf-osdf-settings' - project: diff --git a/jjb/sdnc/sdnc-csit.yaml b/jjb/sdnc/sdnc-csit.yaml index b6fc80bd7..dd76bd4f9 100644 --- a/jjb/sdnc/sdnc-csit.yaml +++ b/jjb/sdnc/sdnc-csit.yaml @@ -8,8 +8,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' functionality: - 'healthcheck': trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle' diff --git a/jjb/wss-unified-agent.config b/jjb/wss-unified-agent.config index 69a219ca2..4a9f091c7 100644 --- a/jjb/wss-unified-agent.config +++ b/jjb/wss-unified-agent.config @@ -129,7 +129,7 @@ wss.url=https://saas.whitesourcesoftware.com/agent ##################################
# Organization tokens:
##################################
-apiKey=571177b044b645ada73b51b7c7107bb7cb7ab2d27ad04ed097e68d39f8edc3de
+apiKey=
#userKey is required if WhiteSource administrator has enabled "Enforce user level access" option
#userKey=
|