Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
Grpc
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
tci-gateway-module
Grpc
Commits
22b6bed4
Commit
22b6bed4
authored
9 years ago
by
Stanley Cheung
Browse files
Options
Downloads
Patches
Plain Diff
revert global_env usage for build_interop_image
parent
5e75116b
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
tools/run_tests/run_interop_tests.py
+11
-9
11 additions, 9 deletions
tools/run_tests/run_interop_tests.py
with
11 additions
and
9 deletions
tools/run_tests/run_interop_tests.py
+
11
−
9
View file @
22b6bed4
...
...
@@ -230,10 +230,7 @@ class PHPLanguage:
return
_SSL_CERT_ENV
def
global_env
(
self
):
# need to manually copy to each jenkins machine if we run into github
# rate limit when running `composer install`
return
{
"
BUILD_INTEROP_DOCKER_EXTRA_ARGS
"
:
"
-v /var/local/.composer/auth.json:/root/.composer/auth.json:ro
"
}
return
{}
def
__str__
(
self
):
return
'
php
'
...
...
@@ -475,16 +472,21 @@ def server_jobspec(language, docker_image):
def
build_interop_image_jobspec
(
language
,
tag
=
None
):
"""
Creates jobspec for building interop docker image for a language
"""
environ
=
language
.
global_env
()
if
not
tag
:
tag
=
'
grpc_interop_%s:%s
'
%
(
language
.
safename
,
uuid
.
uuid4
())
env
iron
[
'
INTEROP_IMAGE
'
]
=
tag
environ
[
'
BASE_NAME
'
]
=
'
grpc_interop_%s
'
%
language
.
safename
env
=
{
'
INTEROP_IMAGE
'
:
tag
,
'
BASE_NAME
'
:
'
grpc_interop_%s
'
%
language
.
safename
}
if
not
args
.
travis
:
environ
[
'
TTY_FLAG
'
]
=
'
-t
'
env
[
'
TTY_FLAG
'
]
=
'
-t
'
# This env variable is used to get around the github rate limit
# error when running the PHP `composer install` command
# TODO(stanleycheung): find a more elegant way to do this
if
language
.
safename
==
'
php
'
:
env
[
'
BUILD_INTEROP_DOCKER_EXTRA_ARGS
'
]
=
\
"
-v /var/local/.composer/auth.json:/root/.composer/auth.json:ro
"
build_job
=
jobset
.
JobSpec
(
cmdline
=
[
'
tools/jenkins/build_interop_image.sh
'
],
environ
=
env
iron
,
environ
=
env
,
shortname
=
"
build_docker_%s
"
%
(
language
),
timeout_seconds
=
30
*
60
)
build_job
.
tag
=
tag
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment