Refactor!: JJB code comply with updates to v5.x

[ci-management.git] / jjb / onap-jjb / onap-pypi-template.yaml

diff --git a/jjb/onap-jjb/onap-pypi-template.yaml b/jjb/onap-jjb/onap-pypi-template.yaml
index bfd7099..7294ee6 100644 (file)
--- a/jjb/onap-jjb/onap-pypi-template.yaml
+++ b/jjb/onap-jjb/onap-pypi-template.yaml
@@ -1,6 +1,6 @@
 ---
 # Job definition Anchors
-- pypi_job_boiler_plate: &pypi_job_boiler_plate
+- _pypi_job_boiler_plate: &pypi_job_boiler_plate
     name: pypi_job_boiler_plate
 
     #####################
@@ -20,6 +20,9 @@
       - compare-type: ANT
         pattern: '**'
 
+    submodule-disable: false
+    submodule-timeout: 10
+
     #####################
     # Job Configuration #
     #####################
@@ -49,6 +52,8 @@
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: true
+          submodule-timeout: '{submodule-timeout}'
+          submodule-disable: '{submodule-disable}'
           choosing-strategy: default
 
     wrappers:
@@ -88,7 +93,7 @@
             - file-id: pypirc
               target: '$HOME/.pypirc'
       - shell:
-          !include-raw-escape: ../shell/pypi-dist-build.sh
+          !include-raw-escape: ../../shell/pypi-dist-build.sh
 
       - publish-pypi:
           pypi-server: staging
@@ -121,7 +126,7 @@
             - file-id: pypirc
               target: '$HOME/.pypirc'
       - shell:
-          !include-raw-escape: ../shell/pypi-dist-build.sh
+          !include-raw-escape: ../../shell/pypi-dist-build.sh
 
       - publish-pypi:
           pypi-server: release
@@ -155,7 +160,7 @@
             - file-id: pypirc
               target: '$HOME/.pypirc'
       - shell:
-          !include-raw-escape: ../shell/pypi-dist-build.sh
+          !include-raw-escape: ../../shell/pypi-dist-build.sh
 
       - publish-pypi:
           pypi-server: staging
@@ -188,7 +193,7 @@
             - file-id: pypirc
               target: '$HOME/.pypirc'
       - shell:
-          !include-raw-escape: ../shell/pypi-dist-build.sh
+          !include-raw-escape: ../../shell/pypi-dist-build.sh
 
       - publish-pypi:
           pypi-server: release