Skip to content

Commit

Permalink
refactor: normalises samples config names (#348)
Browse files Browse the repository at this point in the history
Uses the same pattern as it is being done in the bigquery kokoro config
files: java<version>-samples.cfg.
  • Loading branch information
thiagotnunes committed Jul 15, 2020
1 parent 3dcd9a7 commit 6ee83b5
Show file tree
Hide file tree
Showing 12 changed files with 130 additions and 46 deletions.
32 changes: 32 additions & 0 deletions .kokoro/continuous/java11-samples.cfg
@@ -0,0 +1,32 @@
# Format: //devtools/kokoro/config/proto/build.proto

# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-kokoro-resources/java11"
}

env_vars: {
key: "JOB_TYPE"
value: "samples"
}

env_vars: {
key: "GCLOUD_PROJECT"
value: "gcloud-devel"
}

env_vars: {
key: "GOOGLE_APPLICATION_CREDENTIALS"
value: "keystore/73713_java_it_service_account"
}

before_action {
fetch_keystore {
keystore_resource {
keystore_config_id: 73713
keyname: "java_it_service_account"
}
}
}

@@ -1,5 +1,11 @@
# Format: //devtools/kokoro/config/proto/build.proto

# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-kokoro-resources/java8"
}

env_vars: {
key: "JOB_TYPE"
value: "samples"
Expand All @@ -23,3 +29,4 @@ before_action {
}
}
}

7 changes: 0 additions & 7 deletions .kokoro/continuous/samples/samples-java11.cfg

This file was deleted.

7 changes: 0 additions & 7 deletions .kokoro/continuous/samples/samples-java8.cfg

This file was deleted.

39 changes: 39 additions & 0 deletions .kokoro/nightly/java11-samples.cfg
@@ -0,0 +1,39 @@
# Format: //devtools/kokoro/config/proto/build.proto

# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-kokoro-resources/java11"
}

env_vars: {
key: "JOB_TYPE"
value: "samples"
}

# TODO: remove this after we've migrated all tests and scripts
env_vars: {
key: "GCLOUD_PROJECT"
value: "java-docs-samples-testing"
}

env_vars: {
key: "GOOGLE_CLOUD_PROJECT"
value: "java-docs-samples-testing"
}

env_vars: {
key: "GOOGLE_APPLICATION_CREDENTIALS"
value: "secret_manager/java-docs-samples-service-account"
}

env_vars: {
key: "SECRET_MANAGER_KEYS"
value: "java-docs-samples-service-account"
}

env_vars: {
key: "ENABLE_BUILD_COP"
value: "true"
}

39 changes: 39 additions & 0 deletions .kokoro/nightly/java8-samples.cfg
@@ -0,0 +1,39 @@
# Format: //devtools/kokoro/config/proto/build.proto

# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-kokoro-resources/java8"
}

env_vars: {
key: "JOB_TYPE"
value: "samples"
}

# TODO: remove this after we've migrated all tests and scripts
env_vars: {
key: "GCLOUD_PROJECT"
value: "java-docs-samples-testing"
}

env_vars: {
key: "GOOGLE_CLOUD_PROJECT"
value: "java-docs-samples-testing"
}

env_vars: {
key: "GOOGLE_APPLICATION_CREDENTIALS"
value: "secret_manager/java-docs-samples-service-account"
}

env_vars: {
key: "SECRET_MANAGER_KEYS"
value: "java-docs-samples-service-account"
}

env_vars: {
key: "ENABLE_BUILD_COP"
value: "true"
}

7 changes: 0 additions & 7 deletions .kokoro/nightly/samples/samples-java11.cfg

This file was deleted.

7 changes: 0 additions & 7 deletions .kokoro/nightly/samples/samples-java8.cfg

This file was deleted.

@@ -1,5 +1,11 @@
# Format: //devtools/kokoro/config/proto/build.proto

# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-kokoro-resources/java11"
}

env_vars: {
key: "JOB_TYPE"
value: "samples"
Expand All @@ -25,3 +31,4 @@ env_vars: {
key: "SECRET_MANAGER_KEYS"
value: "java-docs-samples-service-account"
}

@@ -1,5 +1,11 @@
# Format: //devtools/kokoro/config/proto/build.proto

# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-kokoro-resources/java8"
}

env_vars: {
key: "JOB_TYPE"
value: "samples"
Expand All @@ -26,7 +32,3 @@ env_vars: {
value: "java-docs-samples-service-account"
}

env_vars: {
key: "ENABLE_BUILD_COP"
value: "true"
}
7 changes: 0 additions & 7 deletions .kokoro/presubmit/samples/samples-java11.cfg

This file was deleted.

7 changes: 0 additions & 7 deletions .kokoro/presubmit/samples/samples-java8.cfg

This file was deleted.

0 comments on commit 6ee83b5

Please sign in to comment.