Skip to content

Commit 0a3aa97

Browse files
tcoffee-googletcoffee-google
authored
Revert "Add GOOGLE_API_KEY environment variable for integration testing (#2167)"
This reverts commit f6dc561.
1 parent f6dc561 commit 0a3aa97

5 files changed

Lines changed: 22 additions & 33 deletions

File tree

‎.gitignore‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,3 @@ docs/
3434
gcloud-java-wheels/
3535
src/test/resources/gcd-head.zip
3636
src/test/resources/gcd-v1beta2-rev1-2.1.1.zip
37-
38-
# API key file containing value of GOOGLE_API_KEY for integration tests
39-
api_key

‎.travis.yml‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,30 @@
11
language: java
22
matrix:
33
include:
4-
- os: linux
5-
jdk: oraclejdk8
6-
- os: linux
7-
jdk: oraclejdk7
8-
- os: linux
9-
jdk: openjdk7
10-
- os: osx
11-
env: JAVA_HOME=$(/usr/libexec/java_home)
4+
- os: linux
5+
jdk: oraclejdk8
6+
- os: linux
7+
jdk: oraclejdk7
8+
- os: linux
9+
jdk: openjdk7
10+
- os: osx
11+
# see travis issue https://github.com/travis-ci/travis-ci/issues/2839
12+
env: JAVA_HOME=$(/usr/libexec/java_home)
1213
before_install:
1314
- mvn clean
1415
- git clone -b travis `git config --get remote.origin.url` target/travis
1516
- cp target/travis/settings.xml ~/.m2/settings.xml
1617
- cp target/travis/logging.properties logging.properties
17-
install: mvn install --quiet -Djava.util.logging.config.file=logging.properties -DskipTests=true
18-
-Dgpg.skip=true
19-
script:
18+
install: mvn install --quiet -Djava.util.logging.config.file=logging.properties -DskipTests=true -Dgpg.skip=true
19+
script:
2020
- travis_wait 60 utilities/verify.sh
2121
after_success:
2222
- utilities/after_success.sh
2323
env:
2424
global:
25-
- secure: IvdIao/ZBKZ7KcMdbnbpPH5dyujVnr1PAlE9hV+Nu5YujloIDUqTFpSFXB+wnp0CLMlW2kBR6YBhh71mp5M2XSqf+PtWB3b+ts7oz1vwhfUI857P5lMBHapekkNJk874sMjPdAUIprRnRBmVBfZVLMrSDE7LKqnuHXZjSkDGFYk=
26-
- secure: XCtBrBNHGL+c55erAzMGgfCbS7dXSAFrMqIQCiPD6ib9rde3G8aDMvsseY7jSO2ygspB4ubVr+WqNkC5yHMcNUQvkX/auNpSkJbzBFG/2lhC9NBvBAiFJZn5jmcVnQ19vgO2Zjd37B1NrIwT7sW49eVeG0zn/A+qRxWeagPy3SQ=
27-
- secure: YBbdzseg5yDFpQIiMoc3P2BTmqef4o+KAvrLMEbobXjIkiglUQ7UHCoRWClX74fTKAwuC7JvK7o5xJGLnaY43jJADXrGtE8/d44HNJaieE67mNosDYtOiA0iI2uIRFCAnXJCZ8f/iHx2xVMHMNWlwyoil4IUcjj+D7FRcsT5alE=
28-
- secure: Od7BwllgFXVfzFe8ooTNm05TR+Xd5QjHW0oqhU8vclaQs2oX4e0eNIsebXQfLi3xDgd1pz5uUQC/Z4S0NqACwyUuUvPdGYYmRPTR7Dh8HgGJ4ojSdN3RwaHsxUqG7Ajts9rIHOtRpY28xOChVRNX0Z7eAPlvxYU4Ed2ZEo356r0=
29-
- secure: ROxa8HHuba+Dfixljq6poW1+Uwv8EaZUtTTTB7KEtAHJRN8rwoNS4TC0U0PEHcYAL+ivxP3zIfWOCoWreJGoa+V8y9BtLSuamUj/SSsuoHRdJjq5BmcHI/77P11HAzCH6Ul/GxsRB52/IRHwJyfKkh8XUMVSsCl7AG4CKUgt63Y=
30-
- secure: MKZ3y6IYp3Z67T+BO4Brw+my8sRMSMdWWgvUcyBpwQZ64w7ccHJCce4W8WHCPNko/eczHHCJELPG28VNyPTWIV/Jt2ZJ6L9qLCjsQpDPOdJdDaAKc9Df4sm8fB0FBiPVDwMYPQF1/Sy2gK7FZf0YR3LOeoyzswRgmj5bQMdVEeU=
31-
- secure: QlUWsbFDH89PrCC9WZxjON4cylTKBUg7zoYoQiTw90+FCvokaas4PaXDPVmzY1AxPv/ZQWSrcMgLhz43GASD8Ty96bOIKBB8tO6k0FVzff9r9bpiHssNiW0kDp657BFON4UWG75T6wJxKp4jsttvLfhBFMBLKg+fpYlKnaOPqDc=
25+
- secure: "IvdIao/ZBKZ7KcMdbnbpPH5dyujVnr1PAlE9hV+Nu5YujloIDUqTFpSFXB+wnp0CLMlW2kBR6YBhh71mp5M2XSqf+PtWB3b+ts7oz1vwhfUI857P5lMBHapekkNJk874sMjPdAUIprRnRBmVBfZVLMrSDE7LKqnuHXZjSkDGFYk="
26+
- secure: "XCtBrBNHGL+c55erAzMGgfCbS7dXSAFrMqIQCiPD6ib9rde3G8aDMvsseY7jSO2ygspB4ubVr+WqNkC5yHMcNUQvkX/auNpSkJbzBFG/2lhC9NBvBAiFJZn5jmcVnQ19vgO2Zjd37B1NrIwT7sW49eVeG0zn/A+qRxWeagPy3SQ="
27+
- secure: "YBbdzseg5yDFpQIiMoc3P2BTmqef4o+KAvrLMEbobXjIkiglUQ7UHCoRWClX74fTKAwuC7JvK7o5xJGLnaY43jJADXrGtE8/d44HNJaieE67mNosDYtOiA0iI2uIRFCAnXJCZ8f/iHx2xVMHMNWlwyoil4IUcjj+D7FRcsT5alE="
28+
- secure: "Od7BwllgFXVfzFe8ooTNm05TR+Xd5QjHW0oqhU8vclaQs2oX4e0eNIsebXQfLi3xDgd1pz5uUQC/Z4S0NqACwyUuUvPdGYYmRPTR7Dh8HgGJ4ojSdN3RwaHsxUqG7Ajts9rIHOtRpY28xOChVRNX0Z7eAPlvxYU4Ed2ZEo356r0="
29+
- secure: "ROxa8HHuba+Dfixljq6poW1+Uwv8EaZUtTTTB7KEtAHJRN8rwoNS4TC0U0PEHcYAL+ivxP3zIfWOCoWreJGoa+V8y9BtLSuamUj/SSsuoHRdJjq5BmcHI/77P11HAzCH6Ul/GxsRB52/IRHwJyfKkh8XUMVSsCl7AG4CKUgt63Y="
30+
- secure: "MKZ3y6IYp3Z67T+BO4Brw+my8sRMSMdWWgvUcyBpwQZ64w7ccHJCce4W8WHCPNko/eczHHCJELPG28VNyPTWIV/Jt2ZJ6L9qLCjsQpDPOdJdDaAKc9Df4sm8fB0FBiPVDwMYPQF1/Sy2gK7FZf0YR3LOeoyzswRgmj5bQMdVEeU="

‎appveyor.yml‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,18 @@ environment:
1818
- JAVA_HOME: C:\Program Files\Java\jdk1.7.0
1919
GOOGLE_CLOUD_PROJECT:
2020
secure: hbX+cAXrU588+iTMKyzGOQ==
21-
CREDENTIALS_SECRET:
22-
secure: P4H6q90j3t0GC527rKUrpMzYs1z4aqzMh7pfNVqr2ZIJB8H07oeaD0zlosK8An15VQw7q5WTWImiU+yzX1aErct+k2uIah0iArGuEcrKOtQV/4JD10P7QHPsSMXdDXFzbDXsDi6Wf4UDQH7tFGPNU+VrCcXPMfkIlMkYg5tD10TktjdCEJ6YNw0J6SldFeDHDyBkVbmP6SAiQTpqjqO3NDI8i15mH84CWNT90khz4t8Wnhyvnv+J3u89w9Lp/AFoJfkrK2fjDUhR3K1flyG689Skyng2NCSF5wZcq5IPGMRqR+18js4MykeybPVNmEtBBZh+rzPey42oxtQPIX9I6KwPfkXlu2tXuPcbPCpHH5Y=
23-
API_KEY_SECRET:
24-
secure: tlK82v6dlvXT76+w9PNmdf/oABZbzCdiA7JNLE+iUfQ=
21+
SECRET:
22+
secure: P4H6q90j3t0GC527rKUrpMzYs1z4aqzMh7pfNVqr2ZIJB8H07oeaD0zlosK8An15VQw7q5WTWImiU+yzX1aErct+k2uIah0iArGuEcrKOtQV/4JD10P7QHPsSMXdDXFzbDXsDi6Wf4UDQH7tFGPNU+VrCcXPMfkIlMkYg5tD10TktjdCEJ6YNw0J6SldFeDHDyBkVbmP6SAiQTpqjqO3NDI8i15mH84CWNT90khz4t8Wnhyvnv+J3u89w9Lp/AFoJfkrK2fjDUhR3K1flyG689Skyng2NCSF5wZcq5IPGMRqR+18js4MykeybPVNmEtBBZh+rzPey42oxtQPIX9I6KwPfkXlu2tXuPcbPCpHH5Y=
2523

2624
# install required tools (maven, secure-file, encrypted files)
2725
install:
2826
- cmd: echo %JAVA_HOME%
2927
- cmd: echo %M2_HOME%
3028
- ps: $origin = git config --get remote.origin.url; git clone --quiet -b appveyor $origin appveyor
3129
- cmd: nuget install secure-file -ExcludeVersion
32-
- cmd: IF DEFINED CREDENTIALS_SECRET (secure-file\tools\secure-file -decrypt appveyor\key.json.enc -secret %CREDENTIALS_SECRET% -out appveyor\key.json)
33-
- cmd: IF DEFINED CREDENTIALS_SECRET (SET GOOGLE_APPLICATION_CREDENTIALS=%APPVEYOR_BUILD_FOLDER%\appveyor\key.json)
34-
- cmd: ECHO GOOGLE_APPLICATION_CREDENTIALS=%GOOGLE_APPLICATION_CREDENTIALS%
35-
- cmd: IF DEFINED API_KEY_SECRET (secure-file\tools\secure-file -decrypt appveyor\api_key.enc -secret %API_KEY_SECRET% -out appveyor\api_key)
36-
- cmd: IF DEFINED API_KEY_SECRET (SET /P GOOGLE_API_KEY=<%APPVEYOR_BUILD_FOLDER%\appveyor\api_key)
37-
- cmd: ECHO GOOGLE_API_KEY defined
30+
- cmd: IF DEFINED SECRET (secure-file\tools\secure-file -decrypt appveyor\key.json.enc -secret %SECRET% -out appveyor\key.json)
31+
- cmd: IF DEFINED SECRET (SET GOOGLE_APPLICATION_CREDENTIALS=%APPVEYOR_BUILD_FOLDER%\appveyor\key.json)
32+
- cmd: ECHO %GOOGLE_APPLICATION_CREDENTIALS%
3833

3934
# build and install artifacts
4035
build_script:

‎utilities/integration_test_env.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
# Export test env variables
22
export GCLOUD_PROJECT="gcloud-devel"
33
export GOOGLE_APPLICATION_CREDENTIALS=$TRAVIS_BUILD_DIR/signing-tools/gcloud-devel-travis.json
4-
export GOOGLE_API_KEY=$(< $TRAVIS_BUILD_DIR/signing-tools/api_key)

‎utilities/verify.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ if [ "${TRAVIS_PULL_REQUEST}" == "false" ]; then
1111
mkdir $TRAVIS_BUILD_DIR/signing-tools
1212
chmod 700 $TRAVIS_BUILD_DIR/signing-tools
1313
tar xvf $TRAVIS_BUILD_DIR/signing-tools.tar -C $TRAVIS_BUILD_DIR/signing-tools
14-
echo $api_key_password | gpg --passphrase-fd 0 target/travis/api_key.gpg --output $TRAVIS_BUILD_DIR/signing-tools/api_key
1514
else
1615
# Skip integration tests when testing pull requests.
1716
mvn_opts+=" -DskipITs"

0 commit comments

Comments
 (0)