Skip to content
This repository has been archived by the owner on Sep 16, 2023. It is now read-only.

Commit

Permalink
build: fix Kokoro config directories
Browse files Browse the repository at this point in the history
  • Loading branch information
chingor13 committed Sep 30, 2019
1 parent 26c07bf commit c582142
Show file tree
Hide file tree
Showing 29 changed files with 43 additions and 43 deletions.
2 changes: 1 addition & 1 deletion .kokoro/build.bat
@@ -1,3 +1,3 @@
:: See documentation in type-shell-output.bat

"C:\Program Files\Git\bin\bash.exe" github/google-cloud-java/.kokoro/build.sh
"C:\Program Files\Git\bin\bash.exe" github/java-automl/.kokoro/build.sh
4 changes: 2 additions & 2 deletions .kokoro/common.cfg
Expand Up @@ -4,10 +4,10 @@
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"

# All builds use the trampoline script to run in docker.
build_file: "google-cloud-java/.kokoro/trampoline.sh"
build_file: "java-automl/.kokoro/trampoline.sh"

# Tell the trampoline which build file to use.
env_vars: {
key: "TRAMPOLINE_BUILD_FILE"
value: "github/google-cloud-java/.kokoro/build.sh"
value: "github/java-automl/.kokoro/build.sh"
}
4 changes: 2 additions & 2 deletions .kokoro/continuous/common.cfg
Expand Up @@ -11,11 +11,11 @@ action {
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"

# Use the trampoline script to run in docker.
build_file: "google-cloud-java/.kokoro/trampoline.sh"
build_file: "java-automl/.kokoro/trampoline.sh"

env_vars: {
key: "TRAMPOLINE_BUILD_FILE"
value: "github/google-cloud-java/.kokoro/build.sh"
value: "github/java-automl/.kokoro/build.sh"
}

env_vars: {
Expand Down
2 changes: 1 addition & 1 deletion .kokoro/continuous/dependencies.cfg
Expand Up @@ -8,5 +8,5 @@ env_vars: {

env_vars: {
key: "TRAMPOLINE_BUILD_FILE"
value: "github/google-cloud-java/.kokoro/dependencies.sh"
value: "github/java-automl/.kokoro/dependencies.sh"
}
2 changes: 1 addition & 1 deletion .kokoro/continuous/java8-osx.cfg
@@ -1,3 +1,3 @@
# Format: //devtools/kokoro/config/proto/build.proto

build_file: "google-cloud-java/.kokoro/build.sh"
build_file: "java-automl/.kokoro/build.sh"
2 changes: 1 addition & 1 deletion .kokoro/continuous/java8-win.cfg
@@ -1,3 +1,3 @@
# Format: //devtools/kokoro/config/proto/build.proto

build_file: "google-cloud-java/.kokoro/build.bat"
build_file: "java-automl/.kokoro/build.bat"
4 changes: 2 additions & 2 deletions .kokoro/continuous/propose_release.cfg
Expand Up @@ -11,7 +11,7 @@ action {
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"

# Use the trampoline script to run in docker.
build_file: "google-cloud-java/.kokoro/trampoline.sh"
build_file: "java-automl/.kokoro/trampoline.sh"

# Configure the docker image for kokoro-trampoline.
env_vars: {
Expand All @@ -21,7 +21,7 @@ env_vars: {

env_vars: {
key: "TRAMPOLINE_BUILD_FILE"
value: "github/google-cloud-java/.kokoro/continuous/propose_release.sh"
value: "github/java-automl/.kokoro/continuous/propose_release.sh"
}

# tokens used by release-please to keep an up-to-date release PR.
Expand Down
2 changes: 1 addition & 1 deletion .kokoro/continuous/propose_release.sh
Expand Up @@ -21,7 +21,7 @@ export NPM_CONFIG_PREFIX=/home/node/.npm-global
if [ -f ${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-url-release-please ]; then
# Groom the release PR as new commits are merged.
npx release-please release-pr --token=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-token-release-please \
--repo-url=googleapis/google-cloud-java \
--repo-url=googleapis/java-automl \
--package-name="automl" \
--api-url=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-url-release-please \
--proxy-key=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-key-release-please \
Expand Down
2 changes: 1 addition & 1 deletion .kokoro/dependencies.sh
Expand Up @@ -15,7 +15,7 @@

set -eo pipefail

cd github/google-cloud-java/
cd github/java-automl/

# Print out Java
java -version
Expand Down
2 changes: 1 addition & 1 deletion .kokoro/linkage-monitor.sh
Expand Up @@ -17,7 +17,7 @@ set -eo pipefail
# Display commands being run.
set -x

cd github/google-cloud-java/
cd github/java-automl/

# Print out Java version
java -version
Expand Down
4 changes: 2 additions & 2 deletions .kokoro/nightly/common.cfg
Expand Up @@ -11,11 +11,11 @@ action {
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"

# Use the trampoline script to run in docker.
build_file: "google-cloud-java/.kokoro/trampoline.sh"
build_file: "java-automl/.kokoro/trampoline.sh"

env_vars: {
key: "TRAMPOLINE_BUILD_FILE"
value: "github/google-cloud-java/.kokoro/build.sh"
value: "github/java-automl/.kokoro/build.sh"
}

env_vars: {
Expand Down
2 changes: 1 addition & 1 deletion .kokoro/nightly/dependencies.cfg
Expand Up @@ -8,5 +8,5 @@ env_vars: {

env_vars: {
key: "TRAMPOLINE_BUILD_FILE"
value: "github/google-cloud-java/.kokoro/dependencies.sh"
value: "github/java-automl/.kokoro/dependencies.sh"
}
2 changes: 1 addition & 1 deletion .kokoro/nightly/java8-osx.cfg
@@ -1,3 +1,3 @@
# Format: //devtools/kokoro/config/proto/build.proto

build_file: "google-cloud-java/.kokoro/build.sh"
build_file: "java-automl/.kokoro/build.sh"
2 changes: 1 addition & 1 deletion .kokoro/nightly/java8-win.cfg
@@ -1,3 +1,3 @@
# Format: //devtools/kokoro/config/proto/build.proto

build_file: "google-cloud-java/.kokoro/build.bat"
build_file: "java-automl/.kokoro/build.bat"
4 changes: 2 additions & 2 deletions .kokoro/presubmit/common.cfg
Expand Up @@ -11,11 +11,11 @@ action {
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"

# Use the trampoline script to run in docker.
build_file: "google-cloud-java/.kokoro/trampoline.sh"
build_file: "java-automl/.kokoro/trampoline.sh"

env_vars: {
key: "TRAMPOLINE_BUILD_FILE"
value: "github/google-cloud-java/.kokoro/build.sh"
value: "github/java-automl/.kokoro/build.sh"
}

env_vars: {
Expand Down
2 changes: 1 addition & 1 deletion .kokoro/presubmit/dependencies.cfg
Expand Up @@ -8,5 +8,5 @@ env_vars: {

env_vars: {
key: "TRAMPOLINE_BUILD_FILE"
value: "github/google-cloud-java/.kokoro/dependencies.sh"
value: "github/java-automl/.kokoro/dependencies.sh"
}
2 changes: 1 addition & 1 deletion .kokoro/presubmit/java8-osx.cfg
@@ -1,3 +1,3 @@
# Format: //devtools/kokoro/config/proto/build.proto

build_file: "google-cloud-java/.kokoro/build.sh"
build_file: "java-automl/.kokoro/build.sh"
2 changes: 1 addition & 1 deletion .kokoro/presubmit/java8-win.cfg
@@ -1,3 +1,3 @@
# Format: //devtools/kokoro/config/proto/build.proto

build_file: "google-cloud-java/.kokoro/build.bat"
build_file: "java-automl/.kokoro/build.bat"
2 changes: 1 addition & 1 deletion .kokoro/presubmit/linkage-monitor.cfg
Expand Up @@ -8,5 +8,5 @@ env_vars: {

env_vars: {
key: "TRAMPOLINE_BUILD_FILE"
value: "github/google-cloud-java/.kokoro/linkage-monitor.sh"
value: "github/java-automl/.kokoro/linkage-monitor.sh"
}
4 changes: 2 additions & 2 deletions .kokoro/release/bump_snapshot.cfg
Expand Up @@ -11,7 +11,7 @@ action {
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"

# Use the trampoline script to run in docker.
build_file: "google-cloud-java/.kokoro/trampoline.sh"
build_file: "java-automl/.kokoro/trampoline.sh"

# Configure the docker image for kokoro-trampoline.
env_vars: {
Expand All @@ -21,7 +21,7 @@ env_vars: {

env_vars: {
key: "TRAMPOLINE_BUILD_FILE"
value: "github/google-cloud-java/.kokoro/release/bump_snapshot.sh"
value: "github/java-automl/.kokoro/release/bump_snapshot.sh"
}

# tokens used by release-please to keep an up-to-date release PR.
Expand Down
2 changes: 1 addition & 1 deletion .kokoro/release/bump_snapshot.sh
Expand Up @@ -21,7 +21,7 @@ export NPM_CONFIG_PREFIX=/home/node/.npm-global
if [ -f ${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-url-release-please ]; then
# Groom the snapshot release PR immediately after publishing a release
npx release-please release-pr --token=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-token-release-please \
--repo-url=googleapis/google-cloud-java \
--repo-url=googleapis/java-automl \
--package-name="automl" \
--api-url=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-url-release-please \
--proxy-key=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-key-release-please \
Expand Down
2 changes: 1 addition & 1 deletion .kokoro/release/common.cfg
Expand Up @@ -4,7 +4,7 @@
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"

# Use the trampoline script to run in docker.
build_file: "google-cloud-java/.kokoro/trampoline.sh"
build_file: "java-automl/.kokoro/trampoline.sh"

# Configure the docker image for kokoro-trampoline.
env_vars: {
Expand Down
4 changes: 2 additions & 2 deletions .kokoro/release/drop.cfg
Expand Up @@ -2,8 +2,8 @@

env_vars: {
key: "TRAMPOLINE_BUILD_FILE"
value: "github/google-cloud-java/.kokoro/release/drop.sh"
value: "github/java-automl/.kokoro/release/drop.sh"
}

# Download staging properties file.
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/java/releases/google-cloud-java"
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/java/releases/java-automl"
4 changes: 2 additions & 2 deletions .kokoro/release/promote.cfg
Expand Up @@ -2,9 +2,9 @@

env_vars: {
key: "TRAMPOLINE_BUILD_FILE"
value: "github/google-cloud-java/.kokoro/release/promote.sh"
value: "github/java-automl/.kokoro/release/promote.sh"
}

# Download staging properties file.
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/java/releases/google-cloud-java"
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/java/releases/java-automl"

2 changes: 1 addition & 1 deletion .kokoro/release/publish_javadoc.cfg
Expand Up @@ -6,7 +6,7 @@ env_vars: {

env_vars: {
key: "TRAMPOLINE_BUILD_FILE"
value: "github/google-cloud-java/.kokoro/release/publish_javadoc.sh"
value: "github/java-automl/.kokoro/release/publish_javadoc.sh"
}

before_action {
Expand Down
2 changes: 1 addition & 1 deletion .kokoro/release/snapshot.cfg
Expand Up @@ -2,5 +2,5 @@

env_vars: {
key: "TRAMPOLINE_BUILD_FILE"
value: "github/google-cloud-java/.kokoro/release/snapshot.sh"
value: "github/java-automl/.kokoro/release/snapshot.sh"
}
6 changes: 3 additions & 3 deletions .kokoro/release/stage.cfg
Expand Up @@ -2,14 +2,14 @@

env_vars: {
key: "TRAMPOLINE_BUILD_FILE"
value: "github/google-cloud-java/.kokoro/release/stage.sh"
value: "github/java-automl/.kokoro/release/stage.sh"
}

# Need to save the properties file
action {
define_artifacts {
regex: "github/google-cloud-java/target/nexus-staging/staging/*.properties"
strip_prefix: "github/google-cloud-java"
regex: "github/java-automl/target/nexus-staging/staging/*.properties"
strip_prefix: "github/java-automl"
}
}

Expand Down
6 changes: 3 additions & 3 deletions .repo-metadata.json
Expand Up @@ -2,12 +2,12 @@
"name": "automl",
"name_pretty": "AutoML",
"product_documentation": "https://cloud.google.com/automl/docs/",
"client_documentation": "https://googleapis.dev/java/google-cloud-clients/latest/index.html?com/google/cloud/automl/v1beta1/package-summary.html",
"client_documentation": "https://googleapis.dev/java/java-automl/latest/index.html",
"issue_tracker": "https://issuetracker.google.com/savedsearches/559744",
"release_level": "beta",
"language": "java",
"repo": "googleapis/google-cloud-java",
"repo_short": "google-cloud-java",
"repo": "googleapis/java-automl",
"repo_short": "java-automl",
"distribution_name": "com.google.cloud:google-cloud-automl",
"api_id": "automl.googleapis.com"
}
6 changes: 3 additions & 3 deletions synth.metadata
@@ -1,5 +1,5 @@
{
"updateTime": "2019-09-28T07:59:07.097374Z",
"updateTime": "2019-09-30T17:55:05.217967Z",
"sources": [
{
"generator": {
Expand All @@ -12,8 +12,8 @@
"git": {
"name": "googleapis",
"remote": "https://github.com/googleapis/googleapis.git",
"sha": "fcdec366bb4076be75649031706548128a01fc02",
"internalRef": "271635926"
"sha": "95a9834487d476dc5cbf81de1136cf8c74d890bc",
"internalRef": "272006912"
}
},
{
Expand Down

0 comments on commit c582142

Please sign in to comment.