De-lint JJB files
* De-lint files
* Move the sonar URL calls to a global Jenkins Variable
Change-Id: Ic2086d922e848596aab2f2471ee8e615c34f581e
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>
diff --git a/jjb/dcae/apod-analytics.yaml b/jjb/dcae/apod-analytics.yaml
index 6ef85ab..d47b88f 100644
--- a/jjb/dcae/apod-analytics.yaml
+++ b/jjb/dcae/apod-analytics.yaml
@@ -36,4 +36,4 @@
- '{project-name}-{stream}-merge-2scm-mvn-script':
mvn-goals: 'clean deploy'
script:
- !include-raw-escape: 'script-apod-analytics-merge.sh'
+ !include-raw-escape: 'script-apod-analytics-merge.sh'
diff --git a/jjb/dcae/collectors-ves.yaml b/jjb/dcae/collectors-ves.yaml
index c95f20f..0ed3ed1 100644
--- a/jjb/dcae/collectors-ves.yaml
+++ b/jjb/dcae/collectors-ves.yaml
@@ -23,7 +23,9 @@
- '{project-name}-{stream}-daily-release-scm-mvn-script':
# job specific
mvn-goals-versioning:
+ # yamllint disable rule:line-length
'versions:set versions:update-child-modules versions:commit -D1.0.0-SNAPSHOT'
+ # yamllint enable
mvn-goals: 'clean deploy'
maven-deploy-properties: |
deployAtEnd=true
diff --git a/jjb/dcae/dcae-demo.yaml b/jjb/dcae/dcae-demo.yaml
index 066ca32..521b0e9 100644
--- a/jjb/dcae/dcae-demo.yaml
+++ b/jjb/dcae/dcae-demo.yaml
@@ -3,7 +3,6 @@
- project:
name: dcae-demo
project-name: 'dcae-demo'
- stream: 'master'
project: 'dcae/demo'
stream:
- 'master':
@@ -19,16 +18,19 @@
mvn-goals: 'clean deploy'
maven-deploy-properties: |
deployAtEnd=true
+ # yamllint disable rule:line-length
script: |
bash dcae-demo-controller/src/main/docker-build/build.sh
bash dcae-demo-controller/src/main/docker-build/push.sh nexus3.openecomp.org:10003
+ # yamllint enable
- '{project-name}-{stream}-merge-scm-mvn-script':
mvn-goals: 'clean deploy'
+ # yamllint disable rule:line-length
script: |
bash dcae-demo-controller/src/main/docker-build/build.sh
bash dcae-demo-controller/src/main/docker-build/push.sh nexus3.openecomp.org:10003
+ # yamllint enable
- '{project-name}-{stream}-verify-scm-mvn-script':
mvn-goals: 'clean install'
script: |
bash dcae-demo-controller/src/main/docker-build/build.sh
-
diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index 46f452c..a96c625 100644
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -236,7 +236,7 @@
- maven-target:
maven-version: '{maven-version}'
- goals: 'clean deploy sonar:sonar -Dsonar.host.url=https://sonar.openecomp.org'
+ goals: 'clean deploy sonar:sonar -Dsonar.host.url=${{SONAR}}'
properties:
- '{maven-deploy-properties}'
settings: '{mvn-settings}'
@@ -306,7 +306,7 @@
- maven-target:
maven-version: '{maven-version}'
- goals: 'clean deploy sonar:sonar -Dsonar.host.url=https://sonar.openecomp.org'
+ goals: 'clean deploy sonar:sonar -Dsonar.host.url=${{SONAR}}'
properties:
- '{maven-deploy-properties}'
settings: '{mvn-settings}'
@@ -368,7 +368,7 @@
- maven-target:
maven-version: '{maven-version}'
pom: '{pom}'
- goals: 'clean deploy sonar:sonar -Dsonar.host.url=https://sonar.openecomp.org'
+ goals: 'clean deploy sonar:sonar -Dsonar.host.url=${{SONAR}}'
properties:
- '{maven-deploy-properties}'
settings: '{mvn-settings}'
@@ -798,7 +798,7 @@
- maven-target:
maven-version: '{maven-version}'
- goals: 'clean deploy sonar:sonar -Dsonar.host.url=https://sonar.openecomp.org'
+ goals: 'clean deploy sonar:sonar -Dsonar.host.url=${{SONAR}}'
properties:
- '{maven-deploy-properties}'
settings: '{mvn-settings}'
@@ -875,7 +875,7 @@
- maven-target:
maven-version: '{maven-version}'
pom: '{pom}'
- goals: 'clean deploy sonar:sonar -Dsonar.host.url=https://sonar.openecomp.org'
+ goals: 'clean deploy sonar:sonar -Dsonar.host.url=${{SONAR}}'
properties:
- '{maven-deploy-properties}'
settings: '{mvn-settings}'
diff --git a/jjb/global-templates-python.yaml b/jjb/global-templates-python.yaml
index 48ef46a..2ba9f7d 100644
--- a/jjb/global-templates-python.yaml
+++ b/jjb/global-templates-python.yaml
@@ -113,9 +113,9 @@
- shell: |
cp $WORKSPACE/docker/* .
docker -D build -t openecomp/testsuite .
- export DOCKER_REPOSITORY="nexus3.openecomp.org:10003"
- docker tag openecomp/testsuite:latest $DOCKER_REPOSITORY/openecomp/testsuite:latest
- docker push $DOCKER_REPOSITORY/openecomp/testsuite:latest
+ export REPO="nexus3.openecomp.org:10003"
+ docker tag openecomp/testsuite:latest $REPO/openecomp/testsuite:latest
+ docker push $REPO/openecomp/testsuite:latest
- job-template:
name: '{project-name}-{stream}-2scm-docker-shell-daily'
@@ -173,6 +173,6 @@
- shell: |
cp $WORKSPACE/docker/* .
docker -D build -t openecomp/testsuite .
- export DOCKER_REPOSITORY="nexus3.openecomp.org:10003"
- docker tag openecomp/testsuite:latest $DOCKER_REPOSITORY/openecomp/testsuite:latest
- docker push $DOCKER_REPOSITORY/openecomp/testsuite:latest
+ export REPO="nexus3.openecomp.org:10003"
+ docker tag openecomp/testsuite:latest $REPO/openecomp/testsuite:latest
+ docker push $REPO/openecomp/testsuite:latest
diff --git a/jjb/policy/policy-docker.yaml b/jjb/policy/policy-docker.yaml
index b16b0d0..4c1a2b1 100644
--- a/jjb/policy/policy-docker.yaml
+++ b/jjb/policy/policy-docker.yaml
@@ -4,12 +4,12 @@
project-name: 'policy-docker-policy'
jobs:
- '{project-name}-{stream}-verify-scm-mvn-script':
- mvn-goals: 'clean install prepare-package'
- 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:
+ mvn-goals: 'clean install prepare-package'
+ script:
!include-raw-escape: 'include-raw-docker-merge.sh'
- '{project-name}-{stream}-docker-java-shell-daily':
docker-pom: 'pom.xml'
diff --git a/jjb/portal/portal-docker.yaml b/jjb/portal/portal-docker.yaml
index 294e886..2cdd8d2 100644
--- a/jjb/portal/portal-docker.yaml
+++ b/jjb/portal/portal-docker.yaml
@@ -6,13 +6,13 @@
jobs:
- '{project-name}-{stream}-three-scm-verify-script':
script:
- !include-raw-escape: 'docker-build-deploy.sh'
+ !include-raw-escape: 'docker-build-deploy.sh'
- '{project-name}-{stream}-merge-docker-script':
script:
- !include-raw-escape: 'docker-build-push.sh'
+ !include-raw-escape: 'docker-build-push.sh'
- '{project-name}-{stream}-release-docker-script-manual':
script:
- !include-raw-escape: 'docker-build-release.sh'
+ !include-raw-escape: 'docker-build-release.sh'
project: 'portal'
stream:
- 'master':
diff --git a/jjb/vid/vid.yaml b/jjb/vid/vid.yaml
index ce1ec7c..c0b1d01 100644
--- a/jjb/vid/vid.yaml
+++ b/jjb/vid/vid.yaml
@@ -7,8 +7,8 @@
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-java-daily'
- '{project-name}-{stream}-docker-java-daily':
- docker-pom: 'pom.xml'
- mvn-profile: 'docker'
+ docker-pom: 'pom.xml'
+ mvn-profile: 'docker'
project: 'vid'
stream: