fix: Optimize image builds (#2445)

* Ignore tests in ui tasks when packaging for images

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Exclude tests from apiml common lib packaging

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Add full build and test before image building

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Install only required deps in ui images

Signed-off-by: Carson Cook <carson.cook@ibm.com>

Author: CarsonCook

.github/workflows/image-publish-branch.yml

@@ -19,7 +19,7 @@ on:
                 default: 'all'
 
 jobs:
-    build-services:
+    build-test-services:
         runs-on: ubuntu-latest
         steps:
             -   uses: actions/checkout@v2
@@ -41,7 +41,7 @@ jobs:
 
     publish-images:
         needs:
-            - build-services
+            - build-test-services
         uses: zowe/api-layer/.github/workflows/build-conformant-images.yml@master
         with:
             service: ${{ github.event.inputs.service }}

.github/workflows/image-snapshot-release.yml

@@ -5,7 +5,23 @@ on:
         branches: [ master, v2.x.x ]
 
 jobs:
+    build-test-services:
+        runs-on: ubuntu-latest
+        steps:
+            -   uses: actions/checkout@v2
+                with:
+                    ref: ${{ github.head_ref }}
+
+            -   uses: ./.github/actions/setup
+
+            -   name: Build and test services
+                run: ./gradlew build
+
+            -   uses: ./.github/actions/teardown
+
     publish-images:
+        needs:
+            - build-test-services
         uses: zowe/api-layer/.github/workflows/build-conformant-images.yml@master
         with:
             forceNoRelease: true

.github/workflows/image-specific-release.yml

@@ -8,7 +8,23 @@ on:
                 required: true
 
 jobs:
+    build-test-services:
+        runs-on: ubuntu-latest
+        steps:
+            -   uses: actions/checkout@v2
+                with:
+                    ref: ${{ github.head_ref }}
+
+            -   uses: ./.github/actions/setup
+
+            -   name: Build and test services
+                run: ./gradlew build
+
+            -   uses: ./.github/actions/teardown
+
     publish-images:
+        needs:
+            - build-test-services
         uses: zowe/api-layer/.github/workflows/build-conformant-images.yml@master
         with:
             version: ${{ github.event.inputs.release_version }}

api-catalog-ui/build.gradle

@@ -15,6 +15,10 @@ node {
     nodeProjectDir = file("${project.projectDir}/frontend")
 }
 
+if (project.hasProperty('omitDevDependencies')) {
+    npmInstall.args = ['--production', '--omit=dev'] // different args for different npm versions
+}
+
 // =================================================
 //
 //  Please manage all task dependencies in here and

containers/api-catalog-services/prepare.sh

@@ -42,8 +42,9 @@ cleanUpWorkingFolder
 api_catalog_package="api-catalog-package"
 apiml_common_package="apiml-common-lib-package"
 
-buildPackage $api_catalog_package "packageApiCatalog"
-buildPackage $apiml_common_package "packageCommonLib"
+ignoredUiTasks="$(getIgnoredUiTasks "api-catalog-ui")"
+buildPackage $api_catalog_package "packageApiCatalog -PomitDevDependencies ${ignoredUiTasks}"
+buildApimlCommonPackage
 
 preparePackage $api_catalog_package
 preparePackage $apiml_common_package "apiml-common-lib"

containers/discovery-service/prepare.sh

@@ -43,7 +43,7 @@ discovery_package="discovery-package"
 apiml_common_package="apiml-common-lib-package"
 
 buildPackage $discovery_package "packageDiscovery"
-buildPackage $apiml_common_package "packageCommonLib"
+buildApimlCommonPackage
 
 preparePackage $discovery_package
 preparePackage $apiml_common_package "apiml-common-lib"

containers/gateway-service/prepare.sh

@@ -43,7 +43,7 @@ gateway_package="gateway-package"
 apiml_common_package="apiml-common-lib-package"
 
 buildPackage $gateway_package "packageApiGateway"
-buildPackage $apiml_common_package "packageCommonLib"
+buildApimlCommonPackage
 
 preparePackage $gateway_package
 preparePackage $apiml_common_package "apiml-common-lib"

containers/metrics-service/prepare.sh

@@ -42,8 +42,9 @@ cleanUpWorkingFolder
 metrics_package="metrics-service-package"
 apiml_common_package="apiml-common-lib-package"
 
-buildPackage $metrics_package "packageMetricsService"
-buildPackage $apiml_common_package "packageCommonLib"
+ignoredUiTasks="$(getIgnoredUiTasks "metrics-service-ui")"
+buildPackage $metrics_package "packageMetricsService -P omitDevDependencies ${ignoredUiTasks}"
+buildApimlCommonPackage
 
 preparePackage $metrics_package
 preparePackage $apiml_common_package "apiml-common-lib"

containers/prepare-utils.sh

@@ -63,6 +63,11 @@ function cleanUpWorkingFolder {
     mkdir -p "${BASE_DIR}/${WORK_DIR}"
 }
 
+function getIgnoredUiTasks {
+    ui_project=$1
+    echo "-x ${ui_project}:test -x ${ui_project}:npmLint"
+}
+
 function buildPackage {
     service_package=$1
     package_task=$2
@@ -75,6 +80,10 @@ function buildPackage {
     fi
 }
 
+function buildApimlCommonPackage {
+    buildPackage "apiml-common-lib-package" "packageCommonLib -x gateway-service:test -x discovery-service:test -x api-catalog-services:test -x api-catalog-ui:test -x api-catalog-ui:npmLint"
+}
+
 function preparePackage {
     service_package=$1
     subdirectory=$2

metrics-service-ui/build.gradle

@@ -20,6 +20,10 @@ node {
     nodeProjectDir = file("${project.projectDir}/frontend")
 }
 
+if (project.hasProperty('omitDevDependencies')) {
+    npmInstall.args = ['--production', '--omit=dev'] // different args for different npm versions
+}
+
 // =================================================
 //
 //  Please manage all task dependencies in here and