Skip to content

Replace oauth2client with google-auth&Remove presubmit docker test #706

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
qiwzhang merged 7 commits into from
Oct 7, 2019
Merged

Replace oauth2client with google-auth&Remove presubmit docker test #706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
725ef6b
Replace oauth2client with google-auth
TAOXUY Oct 3, 2019
3d976fa
update image
TAOXUY Oct 3, 2019
5c80c33
check if other containers also fail
TAOXUY Oct 7, 2019
44f89bd
Revert "update image"
TAOXUY Oct 7, 2019
fee9e09
remove docker release
TAOXUY Oct 7, 2019
d017648
Revert "Revert "update image""
TAOXUY Oct 7, 2019
3cdbd61
Revert "check if other containers also fail"
TAOXUY Oct 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ SUPPORTED_STAGES = [
]

// Supported VM Images
SLAVE_IMAGE = 'gcr.io/endpoints-jenkins/debian-9:0.10'
SLAVE_IMAGE = 'gcr.io/endpoints-jenkins/debian-9:0.11'

// Release Qualification end to end tests.
// If RAPTURE_REPO build parameter is set only those test will run.
Expand Down Expand Up @@ -221,7 +221,6 @@ def presubmit() {
'release': {
BuildNode {
presubmitTests('release')
presubmitTests('docker-tests', false)
}
},
'tsan': {
Expand Down
2 changes: 1 addition & 1 deletion jenkins/slaves/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PROJECT = endpoints-jenkins
VERSION = 0.10
VERSION = 0.11
TOOLS_BUCKET = endpoints-tools

# Note: The build directory is the root of the istio/test-infra repository, not ./
Expand Down
2 changes: 1 addition & 1 deletion script/linux-install-software
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ ${SUDO} apt-get clean
retry install_packages || error_exit 'Cannot install required packages.'
retry ${SUDO} pip install --upgrade python-gflags || error_exit 'Cannot install gflags.'
retry ${SUDO} pip install --upgrade certifi || error_exit 'Cannot install certifi.'
retry ${SUDO} pip install --upgrade oauth2client || error_exit 'Cannot install oauth2client.'
retry ${SUDO} pip install --upgrade google-auth google-auth-httplib2 google-api-python-client || error_exit 'Cannot install google-auth.'
retry ${SUDO} pip install --upgrade urllib3 || error_exit 'Cannot install urllib3.'
retry ${SUDO} pip install --upgrade prettytable Mako pyaml dateutils || error_exit 'Cannot install prettytable Mako pyaml dateutils.'

Expand Down
2 changes: 1 addition & 1 deletion start_esp/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ pex_binary(
reqs = [
"certifi",
"mako>=1.0.4",
"oauth2client>=3.0.0",
"google-auth>=1.6.3",
"pyasn1>=0.1.9",
"pyasn1-modules>=0.0.8",
"urllib3>=1.16",
Expand Down
4 changes: 2 additions & 2 deletions start_esp/fetch_service_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import json
import logging
import urllib3
from oauth2client.service_account import ServiceAccountCredentials
from google.oauth2.service_account import Credentials

# Service management service
SERVICE_MGMT_ROLLOUTS_URL_TEMPLATE = (
Expand Down Expand Up @@ -144,7 +144,7 @@ def fetch_metadata_attributes(metadata):
def make_access_token(secret_token_json):
"""Construct an access token from service account token."""
logging.info("Constructing an access token with scope " + _GOOGLE_API_SCOPE)
credentials = ServiceAccountCredentials.from_json_keyfile_name(
credentials = Credentials.from_service_account_info(
secret_token_json,
scopes=[_GOOGLE_API_SCOPE])
logging.info("Service account email: " + credentials.service_account_email)
Expand Down