From 4c0f221e8cdb6b8c254c5700fd8d91e578fb5408 Mon Sep 17 00:00:00 2001 From: Lai Jiang Date: Wed, 5 May 2021 13:53:21 -0400 Subject: [PATCH] Re-enable tests in RC build (#1130) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There has been a case where the CI was broken on Friday and no one noticied or fixed it and a RC build was built with broken tests. The tests were disabled due to unknown test failures that have since been fixed. Also update the machine type used by GCB to be more powerful. This is necessary for the tests to past because N1_HIGHCPU_8 is RAM constraint and the tests crashes. I updated all jobs to use the new type which hopefully will make the build faster as well. --- This change is [Reviewable](https://reviewable.io/reviews/google/nomulus/1130) --- .gcloudignore | 1 + release/builder/build.sh | 2 ++ release/cloudbuild-deploy.yaml | 2 +- release/cloudbuild-dev-resource.yaml | 2 +- release/cloudbuild-kythe.yaml | 2 +- release/cloudbuild-nomulus.yaml | 22 +++++++++++----------- release/cloudbuild-proxy.yaml | 2 +- release/cloudbuild-release.yaml | 2 +- release/cloudbuild-schema-deploy.yaml | 2 +- release/cloudbuild-sync.yaml | 2 +- release/cloudbuild-tag.yaml | 2 +- 11 files changed, 22 insertions(+), 19 deletions(-) diff --git a/.gcloudignore b/.gcloudignore index c40ea5703..45fa789b3 100644 --- a/.gcloudignore +++ b/.gcloudignore @@ -1,4 +1,5 @@ python/ +node_modules/ **/build/ **/out/ .*/ diff --git a/release/builder/build.sh b/release/builder/build.sh index 97304a53e..818c9a0bb 100755 --- a/release/builder/build.sh +++ b/release/builder/build.sh @@ -48,6 +48,8 @@ apt-get install docker.io -y apt-get install wget -y wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb apt install ./google-chrome-stable_current_amd64.deb -y +# Install libxss1 (needed by Karma) +apt install libxss1 apt-get remove apt-utils locales -y apt-get autoclean -y apt-get autoremove -y diff --git a/release/cloudbuild-deploy.yaml b/release/cloudbuild-deploy.yaml index c0bd84dcb..c1cfbadba 100644 --- a/release/cloudbuild-deploy.yaml +++ b/release/cloudbuild-deploy.yaml @@ -95,4 +95,4 @@ steps: timeout: 3600s options: - machineType: 'N1_HIGHCPU_8' + machineType: 'E2_HIGHCPU_32' diff --git a/release/cloudbuild-dev-resource.yaml b/release/cloudbuild-dev-resource.yaml index 4b56acbf7..620552111 100644 --- a/release/cloudbuild-dev-resource.yaml +++ b/release/cloudbuild-dev-resource.yaml @@ -35,4 +35,4 @@ steps: 'gs://${PROJECT_ID}-er-diagram'] timeout: 3600s options: - machineType: 'N1_HIGHCPU_8' + machineType: 'E2_HIGHCPU_32' diff --git a/release/cloudbuild-kythe.yaml b/release/cloudbuild-kythe.yaml index 2a3b5e528..d744962a0 100644 --- a/release/cloudbuild-kythe.yaml +++ b/release/cloudbuild-kythe.yaml @@ -58,4 +58,4 @@ artifacts: timeout: 3600s options: - machineType: 'N1_HIGHCPU_8' + machineType: 'E2_HIGHCPU_32' diff --git a/release/cloudbuild-nomulus.yaml b/release/cloudbuild-nomulus.yaml index 6ea621154..f373240e8 100644 --- a/release/cloudbuild-nomulus.yaml +++ b/release/cloudbuild-nomulus.yaml @@ -20,16 +20,16 @@ steps: - name: 'gcr.io/${PROJECT_ID}/builder:latest' args: ['mkdir', 'nomulus'] # Run tests -#- name: 'gcr.io/${PROJECT_ID}/builder:latest' -# # Set home for Gradle caches. Must be consistent with last step below -# # and ./build_nomulus_for_env.sh -# env: [ 'GRADLE_USER_HOME=./cloudbuild-caches' ] -# args: ['./gradlew', -# 'test', -# '-PskipDockerIncompatibleTests=true', -# '-PmavenUrl=gcs://domain-registry-maven-repository/maven', -# '-PpluginsUrl=gcs://domain-registry-maven-repository/plugins' -# ] +- name: 'gcr.io/${PROJECT_ID}/builder:latest' + # Set home for Gradle caches. Must be consistent with last step below + # and ./build_nomulus_for_env.sh + env: [ 'GRADLE_USER_HOME=./cloudbuild-caches' ] + args: ['./gradlew', + 'test', + '-PskipDockerIncompatibleTests=true', + '-PmavenUrl=gcs://domain-registry-maven-repository/maven', + '-PpluginsUrl=gcs://domain-registry-maven-repository/plugins' + ] # Build the tool binary and image. - name: 'gcr.io/${PROJECT_ID}/builder:latest' args: ['release/build_nomulus_for_env.sh', 'tool', 'output'] @@ -138,4 +138,4 @@ artifacts: timeout: 3600s options: - machineType: 'N1_HIGHCPU_8' + machineType: 'E2_HIGHCPU_32' diff --git a/release/cloudbuild-proxy.yaml b/release/cloudbuild-proxy.yaml index b0a5763a5..0b0eebea7 100644 --- a/release/cloudbuild-proxy.yaml +++ b/release/cloudbuild-proxy.yaml @@ -64,4 +64,4 @@ artifacts: - 'release/cloudbuild-tag.yaml' timeout: 3600s options: - machineType: 'N1_HIGHCPU_8' + machineType: 'E2_HIGHCPU_32' diff --git a/release/cloudbuild-release.yaml b/release/cloudbuild-release.yaml index afec4d3fe..ee246f693 100644 --- a/release/cloudbuild-release.yaml +++ b/release/cloudbuild-release.yaml @@ -184,4 +184,4 @@ steps: git push origin ${TAG_NAME} timeout: 3600s options: - machineType: 'N1_HIGHCPU_8' + machineType: 'E2_HIGHCPU_32' diff --git a/release/cloudbuild-schema-deploy.yaml b/release/cloudbuild-schema-deploy.yaml index 139154a08..0b401eaab 100644 --- a/release/cloudbuild-schema-deploy.yaml +++ b/release/cloudbuild-schema-deploy.yaml @@ -94,4 +94,4 @@ steps: gsutil cp - gs://$PROJECT_ID-deployed-tags/sql.${_ENV}.tag\ timeout: 3600s options: - machineType: 'N1_HIGHCPU_8' + machineType: 'E2_HIGHCPU_32' diff --git a/release/cloudbuild-sync.yaml b/release/cloudbuild-sync.yaml index 16120f42e..97d4e87bd 100644 --- a/release/cloudbuild-sync.yaml +++ b/release/cloudbuild-sync.yaml @@ -29,4 +29,4 @@ steps: - gs://$PROJECT_ID-deploy/live timeout: 3600s options: - machineType: 'N1_HIGHCPU_8' + machineType: 'E2_HIGHCPU_32' diff --git a/release/cloudbuild-tag.yaml b/release/cloudbuild-tag.yaml index 5b87c0b19..516da2b4f 100644 --- a/release/cloudbuild-tag.yaml +++ b/release/cloudbuild-tag.yaml @@ -29,4 +29,4 @@ steps: - gcr.io/$PROJECT_ID/${_IMAGE}:live timeout: 3600s options: - machineType: 'N1_HIGHCPU_8' + machineType: 'E2_HIGHCPU_32'