X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-maven-jobs.yaml;h=c5fffb77614786a707e4488a1e1aacc1e7478781;hb=refs%2Fchanges%2F86%2F12986%2F1;hp=42dfafe2d4ae7bd83854df5c7aaabd2fd6683ad3;hpb=d87ce091fe93fff99e25343a69baaa26c186ca85;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-maven-jobs.yaml b/jjb/lf-maven-jobs.yaml
index 42dfafe2..c5fffb77 100644
--- a/jjb/lf-maven-jobs.yaml
+++ b/jjb/lf-maven-jobs.yaml
@@ -1,53 +1,6 @@
 ---
 # This file contains job templates for Maven projects.
 
-- job-group:
-    name: '{project-name}-maven-jobs'
-
-    # This job group contains all the recommended jobs that should be deployed
-    # for any project ci.
-
-    # TODO: Add Maven Merge job to this list once it's been fully tested.
-    jobs:
-      - gerrit-maven-clm
-      - gerrit-maven-merge
-      - gerrit-maven-stage
-      - gerrit-maven-verify
-      - gerrit-maven-verify-dependencies
-
-- job-group:
-    name: '{project-name}-github-maven-jobs'
-
-    # This job group contains all the recommended jobs that should be deployed
-    # for any project ci that is using github.
-
-    # TODO: Add Maven Merge job to this list once it's been fully tested.
-    jobs:
-      - github-maven-clm
-      - github-maven-merge
-      - github-maven-stage
-      - github-maven-verify
-
-- job-group:
-    name: '{project-name}-maven-javadoc-jobs'
-
-    # This job group contains all the recommended jobs that should be deployed
-    # for any project ci.
-
-    jobs:
-      - gerrit-maven-javadoc-publish
-      - gerrit-maven-javadoc-verify
-
-- job-group:
-    name: '{project-name}-github-maven-javadoc-jobs'
-
-    # This job group contains all the recommended jobs that should be deployed
-    # for any project ci.
-
-    jobs:
-      - github-maven-javadoc-publish
-      - github-maven-javadoc-verify
-
 ##########
 # Macros #
 ##########
@@ -159,7 +112,7 @@
     branch: master
     build-days-to-keep: 30  # 30 days for troubleshooting purposes
     build-timeout: 60
-    disable-job: true
+    disable-job: false
     git-url: '$GIT_URL/$PROJECT'
     github-url: 'https://github.com'
     java-version: openjdk8
@@ -167,6 +120,7 @@
     mvn-opts: ''
     mvn-params: ''
     mvn-version: mvn35
+    nexus-iq-namespace: ''  # Recommend a trailing dash when set. Example: odl-
     nexus-iq-stage: 'build'
     stream: master
     submodule-recursive: true
@@ -206,6 +160,7 @@
     disabled: '{disable-job}'
 
     builders:
+      - lf-infra-pre-build
       - lf-maven-install:
           mvn-version: '{mvn-version}'
       - lf-update-java-alternatives:
@@ -221,7 +176,7 @@
       - nexus-iq-policy-evaluator:
           stage: '{nexus-iq-stage}'
           application-type: 'manual'
-          application-id: '{project-name}'
+          application-id: '{nexus-iq-namespace}{project-name}'
           scan-patterns: '{obj:nexus_iq_scan_patterns}'
           fail-build-network-error: true
 
@@ -334,6 +289,7 @@
     disabled: '{disable-job}'
 
     builders:
+      - lf-infra-pre-build
       - lf-maven-install:
           mvn-version: '{mvn-version}'
       - lf-update-java-alternatives:
@@ -348,7 +304,6 @@
       - shell: !include-raw-escape:
           - ../shell/common-variables.sh
           - ../shell/maven-javadoc-generate.sh
-          - ../shell/lftools-install.sh
           - ../shell/maven-javadoc-publish.sh
       - lf-provide-maven-settings-cleanup
 
@@ -462,6 +417,7 @@
     disabled: '{disable-job}'
 
     builders:
+      - lf-infra-pre-build
       - lf-maven-install:
           mvn-version: '{mvn-version}'
       - lf-update-java-alternatives:
@@ -583,6 +539,7 @@
     disabled: '{disable-job}'
 
     builders:
+      - lf-infra-pre-build
       - lf-jacoco-nojava-workaround
       - lf-maven-install:
           mvn-version: '{mvn-version}'
@@ -597,9 +554,7 @@
           properties-content: |
               NEXUS_CUT_DIRS={nexus-cut-dirs}
               NEXUS_REPO={nexus-snapshot-repo}
-      - shell: !include-raw-escape:
-          - ../shell/lftools-install.sh
-          - ../shell/maven-fetch-metadata.sh
+      - shell: !include-raw-escape: ../shell/maven-fetch-metadata.sh
       - lf-maven-build:
           mvn-goals: '{mvn-goals}'
       - lf-maven-deploy
@@ -705,6 +660,7 @@
     mvn-opts: ''
     mvn-params: ''
     mvn-version: mvn35
+    sign-artifacts: false
     stream: master
     submodule-recursive: true
 
@@ -739,6 +695,7 @@
           description: Nexus staging profile ID.
 
     builders:
+      - lf-infra-pre-build
       - lf-jacoco-nojava-workaround
       - lf-maven-install:
           mvn-version: '{mvn-version}'
@@ -749,11 +706,12 @@
           settings-file: '{mvn-settings}'
       - lf-infra-create-netrc:
           server-id: '{mvn-staging-id}'
-      - shell: !include-raw-escape:
-          - ../shell/lftools-install.sh
-          - ../shell/maven-patch-release.sh
+      - shell: !include-raw-escape: ../shell/maven-patch-release.sh
       - lf-maven-build:
           mvn-goals: '{mvn-goals}'
+      - lf-sigul-sign-dir:
+          sign-artifacts: '{sign-artifacts}'
+          sign-dir: '$WORKSPACE/m2repo'
       - lf-maven-stage
       - lf-provide-maven-settings-cleanup
 
@@ -895,6 +853,7 @@
             notbuilt: true
 
     builders:
+      - lf-infra-pre-build
       - lf-infra-maven-sonar:
           java-version: '{java-version}'
           mvn-settings: '{mvn-settings}'
@@ -1023,6 +982,7 @@
     disabled: '{disable-job}'
 
     builders:
+      - lf-infra-pre-build
       - lf-jacoco-nojava-workaround
       - lf-maven-install:
           mvn-version: '{mvn-version}'
@@ -1031,8 +991,6 @@
       - lf-provide-maven-settings:
           global-settings-file: '{mvn-global-settings}'
           settings-file: '{mvn-settings}'
-      - shell: !include-raw-escape:
-          - ../shell/lftools-install.sh
       - lf-maven-build:
           mvn-goals: '{mvn-goals}'
       - lf-provide-maven-settings-cleanup
@@ -1144,6 +1102,7 @@
     disabled: '{disable-job}'
 
     builders:
+      - lf-infra-pre-build
       - lf-jacoco-nojava-workaround
       - lf-maven-install:
           mvn-version: '{mvn-version}'