change default keys

googleapis · Oct 3, 2023 · e1a3991 · e1a3991
1 parent 4e3d5f5
commit e1a3991
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/synthtool/gcp/templates/java_library/.kokoro/nightly/integration.cfg b/synthtool/gcp/templates/java_library/.kokoro/nightly/integration.cfg
@@ -1,10 +1,11 @@
 # Format: //devtools/kokoro/config/proto/build.proto
 
-{%- if 'defaults' in metadata and 'env_vars' in metadata['defaults'] -%}
-{%- for default_key, default_value in metadata['defaults']['env_vars'].items() -%}
+{%- if 'defaults' in metadata and 'kokoro_nightly_env_vars' in metadata['defaults'] -%}
+{%- for default_key, default_value in metadata['defaults']['kokoro_nightly_env_vars'].items() -%}
 {%- if 'partials' in metadata
-  and 'kokoro_nightly_env_vars' in metadata['partials']
-  and default_key not in metadata['partials']['kokoro_nightly_env_vars'] -%}
+  and ('kokoro_nightly_env_vars' not in metadata['partials']
+    or ('kokoro_nightly_env_vars' in metadata['partials']
+      and default_key not in metadata['partials']['kokoro_nightly_env_vars'])) -%}
 {%- if default_key == "ENABLE_FLAKYBOT" %}
 env_vars: {
   key: "{{ default_key }}"

diff --git a/synthtool/gcp/templates/java_library/defaults/integration-default.yaml b/synthtool/gcp/templates/java_library/defaults/integration-default.yaml
@@ -1,4 +1,5 @@
-env_vars:
+# default env_vars in .kokoro/nightly/integration.cfg
+kokoro_nightly_env_vars:
   TRAMPOLINE_IMAGE: gcr.io/cloud-devrel-kokoro-resources/java8
   JOB_TYPE: integration
   GCLOUD_PROJECT: java-docs-samples-testing