From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Fri, 6 May 2016 14:51:50 +0000 (+0000)
Subject: Merge "Revert "Enable shallow clone for git repos""
X-Git-Tag: release/beryllium-sr2~4
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=755df2529e71a80299c0036b61eb5464d40133a3;hp=-c;p=releng%2Fbuilder.git

Merge "Revert "Enable shallow clone for git repos""
---

755df2529e71a80299c0036b61eb5464d40133a3
diff --combined jjb-templates/validate-autorelease.yaml
index de17a9a0c,281122ba0..e2c5329a6
--- a/jjb-templates/validate-autorelease.yaml
+++ b/jjb-templates/validate-autorelease.yaml
@@@ -24,22 -24,16 +24,21 @@@
              release-branch: '{branch}'
          - autorelease-release-datestamp:
              datestamp: true
 +        - string:
 +            name: CLONE_URL
 +            default: 'ssh://jenkins-$SILO@git.opendaylight.org:29418/releng/autorelease'
 +            description: "Autorelease clone URL"
  
      scm:
          - git:
 -            url: 'https://git.opendaylight.org/gerrit/releng/autorelease'
 +            url: '$CLONE_URL'
              refspec: ''
              branches:
                  - 'origin/{branch}'
              skip-tag: true
-             shallow-clone: true
              submodule:
                  recursive: true
 +                timeout: 15
  
      wrappers:
          - autorelease-build-timeout
diff --combined jjb/integration/integration-macros.yaml
index d2b3a2764,c180baec8..d43905b74
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@@ -101,7 -101,6 +101,6 @@@
              branches:
                  - 'origin/{branch}'
              skip-tag: true
-             shallow-clone: true
              choosing-strategy: 'gerrit'
  
  # Macro: integration-distribution-scm
@@@ -119,7 -118,6 +118,6 @@@
              branches:
                  - 'origin/{branch}'
              skip-tag: true
-             shallow-clone: true
  
  # Macro: integration-trigger-patch-submitted
  # Operation: this macro sets a trigger for patch submitted on a path pattern
@@@ -214,23 -212,6 +212,23 @@@
                  count: '{mininet-vms}'
                  stop-on-terminate: False
  
 +# Macro: integration-jclouds-controller-devstack
 +# Operation: this macro will spin the controller and devstack vms
 +# Used by: {project}-csit-openstack job templates
 +- wrapper:
 +    name: integration-jclouds-controller-devstack
 +    wrappers:
 +      - jclouds:
 +          instances:
 +            - rk-c7-java:
 +                cloud-name: 'Rackspace DFW - Integration Dynamic Lab'
 +                count: '{controller-vms}'
 +                stop-on-terminate: False
 +            - rk-c7-devstack:
 +                cloud-name: 'Rackspace DFW - Devstack'
 +                count: '{openstack-vms}'
 +                stop-on-terminate: False
 +
  #################
  # Shell Scripts #
  #################
@@@ -312,6 -293,17 +310,6 @@@
              !include-raw:
                  - include-raw-integration-deploy-devstack-testing.sh
  
 -# Macro: integration-deploy-controller
 -# Operation: this macro prepares 3-node cluster controller
 -# Used by: {project}-csit-3node-* job templates
 -
 -- builder:
 -    name: integration-deploy-controller
 -    builders:
 -        - shell:
 -            !include-raw:
 -                - include-raw-integration-deploy-controller.sh
 -
  # Macro: integration-configure-clustering
  # Operation: this macro configures the clustering
  # Used by: {project}-csit-3node-* job templates
@@@ -411,12 -403,6 +409,12 @@@
              !include-raw:
                  - include-raw-integration-rebase-gerrit-patch.sh
  
 +- builder:
 +    name: integration-deploy-openstack-run-test
 +    builders:
 +        - shell:
 +            !include-raw:
 +                - include-raw-integration-deploy-openstack-run-test.sh
  ##############
  # Publishers #
  ##############
diff --combined jjb/releng-macros.yaml
index 4238aa26f,d56eb57c5..2c558d698
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@@ -32,14 -32,6 +32,14 @@@
              default: '{refspec}'
              description: "GERRIT_REFSPEC parameter if not given by trigger"
  
 +- parameter:
 +    name: build-tag
 +    parameters:
 +        - string:
 +            name: BUILD_TAG
 +            default: ''
 +            description: 'Tag in Git to checkout'
 +
  - parameter:
      name: controller-version-parameter
      parameters:
@@@ -64,22 -56,6 +64,22 @@@
              default: 'master'
              description: 'distribution repo branch to build with'
  
 +- parameter:
 +    name: p2zip-parameter
 +    parameters:
 +        - string:
 +            name: P2ZIP_URL
 +            default: ''
 +            description: 'Nexus staging profile id'
 +
 +- parameter:
 +    name: stage-id-parameter
 +    parameters:
 +        - string:
 +            name: STAGING_PROFILE_ID
 +            default: '{stage-id}'
 +            description: 'Nexus staging profile id'
 +
  - scm:
      name: git-scm
      scm:
@@@ -90,7 -66,6 +90,6 @@@
              branches:
                  - 'origin/{branch}'
              skip-tag: true
-             shallow-clone: true
              wipe-workspace: true
  
  - scm:
@@@ -103,7 -78,6 +102,6 @@@
              branches:
                  - 'origin/$GERRIT_BRANCH'
              skip-tag: true
-             shallow-clone: true
              choosing-strategy: '{choosing-strategy}'
  
  - wrapper:
@@@ -263,24 -237,3 +261,24 @@@
            variable: 'GLOBAL_SETTINGS_FILE'
          - file-id: '{settings-file}'
            variable: 'SETTINGS_FILE'
 +
 +- builder:
 +    name: releng-generate-p2pom
 +    builders:
 +        - shell: !include-raw: include-raw-generate-p2pom.sh
 +
 +- builder:
 +    name: releng-update-p2composite-metadata
 +    builders:
 +    - shell: !include-raw: include-raw-update-p2composite-metadata.sh
 +    - maven-target:
 +        maven-version: '{maven-version}'
 +        pom: 'deploy-composite-repo.xml'
 +        goals: 'clean deploy -V -Dmaven.repo.local=/tmp/r'
 +        settings: '{settings}'
 +        global-settings: '{global-settings}'
 +
 +- builder:
 +    name: releng-stage-release
 +    builders:
 +        - shell: !include-raw: include-raw-stage-release.sh