Fix akraino-project-stream-release-config job def

The akraino-project-stream-release-config job definition was not
properly using the global-jjb helper macros and has therefore been
failing to properly build the environment needed for deploying a tarball
to Nexus

Change-Id: Ia5600503983e7c88b6949f875f338c05cf7048f0
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>

diff --git a/jjb/addon-onap/addon-onap.yaml b/jjb/addon-onap/addon-onap.yaml
index def81af..e5169f0 100644 (file)
--- a/jjb/addon-onap/addon-onap.yaml
+++ b/jjb/addon-onap/addon-onap.yaml
@@ -18,25 +18,14 @@
     name: addon-onap
     project-name: addon-onap
     project: addon-onap
-    global-settings-file: global-settings
     build-node: centos7-builder-2c-1g
     stream: master
-    maven-repo-url: 'https://nexus.akraino.org'
-    java-version: openjdk8
-    mvn-version: mvn35
-    mvn-opts: ''
-    mvn-params: ''
     mvn-settings: addon-onap-settings
-    nexus-shapshot-repo: snapshots
-    build-timeout: 60
-    submodule-recursive: true
     group-id: org.akraino.addon-onap
-    repo-id: snapshots
     refspec: refs/heads/master
     branch: master
-    upload-files-dir: '/tmp/tardir'
     jobs:
-     - akraino-project-stream-release-config
+      - akraino-project-stream-release-config
     views:
       - common-view
     cron: 'H H * * 0'  # push fresh snapshot weekly

diff --git a/jjb/airshipinabottle_deploy/airshipinabottle_deploy.yaml b/jjb/airshipinabottle_deploy/airshipinabottle_deploy.yaml
index 1aac7cd..44d6574 100644 (file)
--- a/jjb/airshipinabottle_deploy/airshipinabottle_deploy.yaml
+++ b/jjb/airshipinabottle_deploy/airshipinabottle_deploy.yaml
@@ -18,23 +18,12 @@
     name: airshipinabottle_deploy
     project-name: airshipinabottle_deploy
     project: airshipinabottle_deploy
-    global-settings-file: global-settings
     build-node: centos7-builder-2c-1g
     stream: master
-    maven-repo-url: 'https://nexus.akraino.org'
-    java-version: openjdk8
-    mvn-version: mvn35
-    mvn-opts: ''
-    mvn-params: ''
     mvn-settings: airshipinabottle_deploy-settings
-    nexus-shapshot-repo: snapshots
-    build-timeout: 60
-    submodule-recursive: true
     group-id: org.akraino.airshipinabottle_deploy
-    repo-id: snapshots
     refspec: refs/heads/master
     branch: master
-    upload-files-dir: '/tmp/tardir'
     jobs:
       - akraino-project-stream-release-config
     views:

diff --git a/jjb/akraino-templates/akraino-jjb-templates.yaml b/jjb/akraino-templates/akraino-jjb-templates.yaml
index d0cd987..d31c9aa 100644 (file)
--- a/jjb/akraino-templates/akraino-jjb-templates.yaml
+++ b/jjb/akraino-templates/akraino-jjb-templates.yaml
@@ -17,17 +17,42 @@
 - job-template:
     id: akraino-project-stream-release-config
     name: '{project}-{stream}-release-config'
+
+    ######################
+    # Default parameters #
+    ######################
+
+    archive-artifacts: >
+      **/*.log
+      **/hs_err_*.log
+      **/target/**/feature.xml
+      **/target/failsafe-reports/failsafe-summary.xml
+      **/target/surefire-reports/*-output.txt
+    build-days-to-keep: 30
+    build-timeout: 60
+    java-version: openjdk8
+    maven-repo-url: '$NEXUS_URL/content/repositories/snapshots'
+    mvn-global-settings: global-settings
+    mvn-opts: ''
+    mvn-params: ''
+    mvn-version: mvn35
+    nexus-shapshot-repo: snapshots
+    repo-id: snapshots
+    staging-profile-id: ''  # Unused by this job.
+    stream: master
+    submodule-recursive: true
+    upload-files-dir: /tmp/tardir
+
+    #####################
+    # Job Configuration #
+    #####################
+
     project-type: freestyle
     node: '{build-node}'
 
-    gerrit_merge_triggers:
-      - change-merged-event
-      - comment-added-contains-event:
-          comment-contains-value: remerge$
-
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: '.*'
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
 
     parameters:
       - lf-infra-parameters:
@@ -39,7 +64,30 @@
           mvn-opts: '{mvn-opts}'
           mvn-params: '{mvn-params}'
           mvn-version: '{mvn-version}'
+          # Staging repos do not make sense for CLM jobs so set it blank.
           staging-profile-id: '{staging-profile-id}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
+      - string:
+          name: UPLOAD_FILES_PATH
+          default: '{upload-files-dir}'
+          description: File path to generate tarball and upload to repository.
+
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: '{build-timeout}'
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+
+    gerrit_merge_triggers:
+      - change-merged-event
+      - comment-added-contains-event:
+          comment-contains-value: remerge$
+
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: '.*'
 
     scm:
       - lf-infra-gerrit-scm:
@@ -50,31 +98,6 @@
           submodule-recursive: '{submodule-recursive}'
           choosing-strategy: default
 
-    nexus-shapshot-repo: snapshots
-    builders:
-      - lf-maven-install:
-          mvn-version: '{mvn-version}'
-      - lf-update-java-alternatives:
-          java-version: '{java-version}'
-      - lf-provide-maven-settings:
-          global-settings-file: '{global-settings-file}'
-          settings-file: '{mvn-settings}'
-      - lf-infra-create-netrc:
-          server-id: '{mvn-staging-id}'
-      - inject:
-          properties-content: |
-              MAVEN_REPO_URL={maven-repo-url}
-              REPO_ID={repo-id}
-              GROUP_ID={group-id}
-              UPLOAD_FILES_PATH={upload-files-dir}
-              PROJECT={project}
-      - shell: !include-raw-escape:
-          - ../shell/make-tar.sh
-          - ../global-jjb/shell/common-variables.sh
-          - ../global-jjb/shell/lftools-install.sh
-          - ../global-jjb/shell/deploy-maven-file.sh
-      - lf-provide-maven-settings-cleanup
-
     triggers:
       - timed: '{obj:cron}'
       - gerrit:
@@ -87,3 +110,25 @@
                 - branch-compare-type: ANT
                   branch-pattern: '**/{branch}'
               file-paths: '{obj:gerrit_trigger_file_paths}'
+
+    builders:
+      - lf-maven-install:
+          mvn-version: '{mvn-version}'
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
+      - lf-provide-maven-settings:
+          global-settings-file: '{mvn-global-settings}'
+          settings-file: '{mvn-settings}'
+      - shell: !include-raw-escape:
+          - ../shell/make-tar.sh
+      - lf-infra-deploy-maven-file:
+          global-settings-file: '{mvn-global-settings}'
+          settings-file: '{mvn-settings}'
+          mvn-version: '{mvn-version}'
+          repo-id: '{repo-id}'
+          group-id: '{group-id}'
+          upload-files-dir: '{upload-files-dir}'
+          maven-repo-url: '{maven-repo-url}'
+
+    publishers:
+      - lf-infra-publish

diff --git a/jjb/sample_vnf/sample_vnf.yaml b/jjb/sample_vnf/sample_vnf.yaml
index 5da663b..a5e8d88 100644 (file)
--- a/jjb/sample_vnf/sample_vnf.yaml
+++ b/jjb/sample_vnf/sample_vnf.yaml
@@ -18,23 +18,12 @@
     name: sample_vnf
     project-name: sample_vnf
     project: sample_vnf
-    global-settings-file: global-settings
     build-node: centos7-builder-2c-1g
     stream: master
-    maven-repo-url: 'https://nexus.akraino.org'
-    java-version: openjdk8
-    mvn-version: mvn35
-    mvn-opts: ''
-    mvn-params: ''
     mvn-settings: sample_vnf-settings
-    nexus-shapshot-repo: snapshots
-    build-timeout: 60
-    submodule-recursive: true
     group-id: org.akraino.sample_vnf
-    repo-id: snapshots
     refspec: refs/heads/master
     branch: master
-    upload-files-dir: '/tmp/tardir'
     jobs:
       - akraino-project-stream-release-config
     views:

diff --git a/jjb/test_automation/test_automation.yaml b/jjb/test_automation/test_automation.yaml
index cb7373d..74ebfe7 100644 (file)
--- a/jjb/test_automation/test_automation.yaml
+++ b/jjb/test_automation/test_automation.yaml
@@ -18,23 +18,12 @@
     name: test_automation
     project-name: test_automation
     project: test_automation
-    global-settings-file: global-settings
     build-node: centos7-builder-2c-1g
     stream: master
-    maven-repo-url: 'https://nexus.akraino.org'
-    java-version: openjdk8
-    mvn-version: mvn35
-    mvn-opts: ''
-    mvn-params: ''
     mvn-settings: test_automation-settings
-    nexus-shapshot-repo: snapshots
-    build-timeout: 60
-    submodule-recursive: true
     group-id: org.akraino.test_automation
-    repo-id: snapshots
     refspec: refs/heads/master
     branch: master
-    upload-files-dir: '/tmp/tardir'
     jobs:
       - akraino-project-stream-release-config
     views:

diff --git a/jjb/yaml_builds/yaml_builds.yaml b/jjb/yaml_builds/yaml_builds.yaml
index 9dae230..d02d1fb 100644 (file)
--- a/jjb/yaml_builds/yaml_builds.yaml
+++ b/jjb/yaml_builds/yaml_builds.yaml
@@ -18,23 +18,12 @@
     name: yaml_builds
     project-name: yaml_builds
     project: yaml_builds
-    global-settings-file: global-settings
     build-node: centos7-builder-2c-1g
     stream: master
-    maven-repo-url: 'https://nexus.akraino.org'
-    java-version: openjdk8
-    mvn-version: mvn35
-    mvn-opts: ''
-    mvn-params: ''
     mvn-settings: yaml_builds-settings
-    nexus-shapshot-repo: snapshots
-    build-timeout: 60
-    submodule-recursive: true
     group-id: org.akraino.yaml_builds
-    repo-id: snapshots
     refspec: refs/heads/master
     branch: master
-    upload-files-dir: '/tmp/tardir'
     jobs:
       - akraino-project-stream-release-config
     views: