Rearrange to allow binaries been kept

Author: lwasylow

templates/t-extend-database-build.yml

@@ -49,6 +49,20 @@ stages:
       pool:
         vmImage: ubuntu-latest
       jobs:
+        - template: t-extend-download-binaries.yml
+          parameters:
+            packages:
+              - name: sqlcl
+                download_location: "$(Build.BinariesDirectory)/sqlcl-latest.zip"
+                unpack_location: "$(Build.BinariesDirectory)"
+                url: "https://download.oracle.com/otn_software/java/sqldeveloper/sqlcl-latest.zip"
+                archive: "zip"
+        
+              - name: utlplsqlcli
+                download_location: "$(Build.BinariesDirectory)/utPLSQL-cli.zip"
+                unpack_location: "$(Build.BinariesDirectory)"
+                url: "https://github.com/utPLSQL/utPLSQL-cli/releases/download/$(UTPLSQL_CLI_VERSION)/utPLSQL-cli.zip"
+                archive: "zip"          
         - job: CreateDatabase
           displayName: Create Database
           steps:

templates/t-extend-download-binaries.yml

@@ -19,32 +19,27 @@ parameters:
         type: boolean
         default: true
 
-stages:
-  - ${{ if parameters.enableDownload }}:
-    - stage: DownloadBinaries
-      pool:
-        vmImage: ubuntu-latest
-      jobs:
-        - job: DownloadBinaries
-          displayName: Download Build Binaries
-          steps:
-            - checkout: none
-            - ${{ each package in parameters.packages }}:
-              - bash: |    
-                  curl -Lk -o ${{package.download_location}} \
-                        ${{package.url}}
-                displayName: 'Download ${{package.name}}'
 
-              - ${{ if eq(package.archive,'zip') }}:
-                - bash: |    
-                    echo Unzipping to ${{package.unpack_location}}
-                    unzip   -qq -d ${{package.unpack_location}} ${{package.download_location}}
-                    chmod -R u+x ${{package.unpack_location}}
-                  displayName: 'Unzip ${{package.name}}'
+jobs:
+  - job: DownloadBinaries
+    displayName: Download Build Binaries
+    steps:
+      - checkout: none
+      - ${{ each package in parameters.packages }}:
+        - bash: |    
+            curl -Lk -o ${{package.download_location}} \
+                  ${{package.url}}
+          displayName: 'Download ${{package.name}}'
+        - ${{ if eq(package.archive,'zip') }}:
+          - bash: |    
+              echo Unzipping to ${{package.unpack_location}}
+              unzip   -qq -d ${{package.unpack_location}} ${{package.download_location}}
+              chmod -R u+x ${{package.unpack_location}}
+            displayName: 'Unzip ${{package.name}}'
 
-              - ${{ if coalesce(package.clean,true) }}:
-                - bash: |    
-                    rm -rf ${{package.download_location}}
+        - ${{ if coalesce(package.clean,true) }}:
+          - bash: |    
+              rm -rf ${{package.download_location}}
 
-                    ls -ltr $(Build.BinariesDirectory)
-                  displayName: 'Clean ${{package.name}}'             
+              ls -ltr $(Build.BinariesDirectory)
+            displayName: 'Clean ${{package.name}}'             

utlplsql-demo-project.yml

@@ -12,23 +12,8 @@ variables:
   UTPLSQL_VERSION: 'v3.1.11' 
   DOCKHER_HUB_REPO: 'utplsqlv3/oracledb'
 
-stages:
-  - template: templates/t-extend-download-binaries.yml
-    parameters:
-      packages:
-        - name: sqlcl
-          download_location: "$(Build.BinariesDirectory)/sqlcl-latest.zip"
-          unpack_location: "$(Build.BinariesDirectory)"
-          url: "https://download.oracle.com/otn_software/java/sqldeveloper/sqlcl-latest.zip"
-          archive: "zip"
-  
-        - name: utlplsqlcli
-          download_location: "$(Build.BinariesDirectory)/utPLSQL-cli.zip"
-          unpack_location: "$(Build.BinariesDirectory)"
-          url: "https://github.com/utPLSQL/utPLSQL-cli/releases/download/$(UTPLSQL_CLI_VERSION)/utPLSQL-cli.zip"
-          archive: "zip"
-    
-  - template: templates/t-extend-database-build.yml
+extends:
+  template: templates/t-extend-database-build.yml
     parameters:
       utplsqlVersion: ${UTPLSQL_VERSION}
       utplsqlDir: ${UTPLSQL_DIR}