зеркало из https://github.com/microsoft/spinnaker.git
Fix comment typos in dev module.
This commit is contained in:
Родитель
bef0d0855c
Коммит
6ba93a8c28
|
@ -37,7 +37,7 @@
|
|||
# reference the authoritative repository for the given repository.
|
||||
# (e.g. the spinnaker github repository corresponding to your origin).
|
||||
#
|
||||
# If the environment variable GIHUB_REPOSITORY_OWNER is set then
|
||||
# If the environment variable GITHUB_REPOSITORY_OWNER is set then
|
||||
# the repositories will be cloned from that github user. Otherwise it
|
||||
# will be cloned from the user in your .git-credentials. If the owner
|
||||
# is "upstream" then it will clone the authoritative repository for each
|
||||
|
@ -203,7 +203,7 @@ if prompt_YN "Y" "Install (or update) Google Cloud Platform SDK?"; then
|
|||
fi
|
||||
|
||||
# Setup AWS SDK
|
||||
# If awscli isnt installed, give a second chance here for consistency
|
||||
# If awscli isn't installed, give a second chance here for consistency
|
||||
if ! aws --version >& /dev/null && prompt_YN "Y" "Install AWS Platform SDK?"; then
|
||||
sudo apt-get install -y awscli
|
||||
fi
|
||||
|
@ -233,7 +233,7 @@ echo "{\"interactive\":false}" > ~/.bowerrc
|
|||
|
||||
|
||||
# If this script was run in a different shell then we
|
||||
# dont have the environment variables we set, and arent in the build directory.
|
||||
# don't have the environment variables we set, and aren't in the build directory.
|
||||
function print_invoke_instructions() {
|
||||
cat <<EOF
|
||||
|
||||
|
|
|
@ -76,7 +76,7 @@ def ensure_gcs_bucket(name, project=''):
|
|||
bucket configured to gcloud.
|
||||
|
||||
Raises:
|
||||
RutimeError if the bucket could not be created.
|
||||
RuntimeError if the bucket could not be created.
|
||||
"""
|
||||
bucket = 'gs://'+ name
|
||||
if not project:
|
||||
|
@ -122,7 +122,7 @@ def ensure_s3_bucket(name, region=""):
|
|||
region [string]: The S3 region for the bucket. If empty use aws default.
|
||||
|
||||
Raises:
|
||||
RutimeError if the bucket could not be created.
|
||||
RuntimeError if the bucket could not be created.
|
||||
"""
|
||||
bucket = 's3://' + name
|
||||
list_result = run_quick('aws s3 ls ' + bucket, echo=False)
|
||||
|
@ -144,7 +144,7 @@ class BackgroundProcess(
|
|||
|
||||
Attributes:
|
||||
name [string]: The visible name of the process for reporting.
|
||||
subproces [subprocess]: The subprocess instance.
|
||||
subprocess [subprocess]: The subprocess instance.
|
||||
"""
|
||||
|
||||
@staticmethod
|
||||
|
@ -270,9 +270,9 @@ class Builder(object):
|
|||
# The problem here is that BinTray does not allow packages to change once
|
||||
# they have been published (even though we are explicitly asking it to
|
||||
# override). PATCH wont work either.
|
||||
# Since we are building from source, we dont really have a version
|
||||
# Since we are building from source, we don't really have a version
|
||||
# yet, since we are still modifying the code. Either we need to generate a new
|
||||
# version number every time or we dont want to publish these.
|
||||
# version number every time or we don't want to publish these.
|
||||
# Ideally we could control whether or not to publish. However,
|
||||
# if we do not publish, then the repository will not be visible without
|
||||
# credentials, and adding conditional credentials into the packer scripts
|
||||
|
@ -293,7 +293,7 @@ class Builder(object):
|
|||
urllib2.urlopen(delete_request)
|
||||
print 'Deleted...'
|
||||
except HTTPError as ex:
|
||||
# Maybe it didnt exist. Try again anyway.
|
||||
# Maybe it didn't exist. Try again anyway.
|
||||
print 'Delete {url} got {ex}. Try again anyway.'.format(url=url, ex=ex)
|
||||
pass
|
||||
print 'Retrying {url}'.format(url=url)
|
||||
|
|
|
@ -371,7 +371,7 @@ def maybe_copy_master_yml(options):
|
|||
with open(options.master_yml, 'r') as f:
|
||||
content = f.read()
|
||||
|
||||
# Replace all the occurances of the original credentials path with the
|
||||
# Replace all the occurrences of the original credentials path with the
|
||||
# path that we are going to place the file in on the new instance.
|
||||
if json_credential_path:
|
||||
if not os.path.exists(json_credential_path):
|
||||
|
|
|
@ -239,15 +239,15 @@ class DevRunner(spinnaker_runner.Runner):
|
|||
print 'Waiting for deck to start on port {port}'.format(port=deck_port)
|
||||
|
||||
# Tail the log file while we wait and run.
|
||||
# But the log file might not yet exist if deck hasnt started yet.
|
||||
# But the log file might not yet exist if deck hasn't started yet.
|
||||
# So wait for the log file to exist before starting to tail it.
|
||||
# Deck cant be ready yet if it hasnt started yet anyawy.
|
||||
# Deck cant be ready yet if it hasn't started yet anyway.
|
||||
deck_log_path = os.path.join(self.installation.LOG_DIR, 'deck.log')
|
||||
while not os.path.exists(deck_log_path):
|
||||
time.sleep(0.1)
|
||||
ignore_tail_jobs.append(self.start_tail(deck_log_path))
|
||||
|
||||
# Dont just wait for port to be ready, but for deck to respond
|
||||
# Don't just wait for port to be ready, but for deck to respond
|
||||
# because it takes a long time to startup once port is ready.
|
||||
while True:
|
||||
code, ignore = fetch('http://localhost:{port}/'.format(port=deck_port))
|
||||
|
|
|
@ -14,7 +14,7 @@ function process_args() {
|
|||
--no_awscli)
|
||||
NO_AWSCLI=true
|
||||
;;
|
||||
# Keep around for compatability with docs people have.
|
||||
# Keep around for compatibility with docs people have.
|
||||
--package_manager)
|
||||
echo "--package_manager option is no longer needed and deprecated."
|
||||
;;
|
||||
|
@ -41,7 +41,7 @@ sudo apt-get install -y build-essential
|
|||
sudo apt-get install -y redis-server
|
||||
|
||||
|
||||
# Add shortcut devvm host for convienence
|
||||
# Add shortcut devvm host for convenience
|
||||
if ! egrep '(^| )devvm( |$)' /etc/hosts; then
|
||||
sed -i 's/^127.0.0.1 /127.0.0.1 devvm /'
|
||||
fi
|
||||
|
@ -63,10 +63,10 @@ EOF
|
|||
sudo bash -c "echo '$content' > /etc/profile.d/nvm.sh"
|
||||
|
||||
|
||||
# Install aws command-line tool (for convienence)
|
||||
# Install aws command-line tool (for convenience)
|
||||
if [ "x$NO_AWSCLI" = "x" ] && ! aws --version >& /dev/null; then
|
||||
sudo apt-get install -y awscli
|
||||
fi
|
||||
|
||||
# Install google command-line tool (for convienence)
|
||||
# Install google command-line tool (for convenience)
|
||||
# in the bootstrap_dev.sh because it typically is not installed as root.
|
||||
|
|
|
@ -184,7 +184,7 @@ class Refresher(object):
|
|||
"""Determine the URL for a given github repository.
|
||||
|
||||
Args:
|
||||
respository [string]: The upstream SourceRepository.
|
||||
repository [string]: The upstream SourceRepository.
|
||||
owner [string]: The explicit owner for the repository we want.
|
||||
If not provided then use the github_user in the bound options.
|
||||
"""
|
||||
|
@ -216,7 +216,7 @@ class Refresher(object):
|
|||
upstream_url = 'https://github.com/{upstream_user}/{name}.git'.format(
|
||||
upstream_user=upstream_user, name=name)
|
||||
|
||||
# Dont echo because we're going to hide some failure.
|
||||
# Don't echo because we're going to hide some failure.
|
||||
print 'Cloning {name} from {origin_url} -b {branch}.'.format(
|
||||
name=name, origin_url=origin_url, branch=branch)
|
||||
shell_result = run_and_monitor(
|
||||
|
@ -287,7 +287,7 @@ class Refresher(object):
|
|||
.format(name=name, branch=branch))
|
||||
|
||||
def pull_from_upstream_if_master(self, repository):
|
||||
"""Pulls the master branch fromthe upstream repository.
|
||||
"""Pulls the master branch from the upstream repository.
|
||||
|
||||
This will only have effect if the local repository exists
|
||||
and is currently in the master branch.
|
||||
|
@ -456,7 +456,7 @@ bash -c "(npm start >> '$LOG_DIR/{name}.log') 2>&1\
|
|||
"""
|
||||
|
||||
# Note that we only pull the master branch from upstream.
|
||||
# Pulling other branches dont normally make sense.
|
||||
# Pulling other branches don't normally make sense.
|
||||
parser.add_argument('--pull_upstream', default=False,
|
||||
action='store_true',
|
||||
help='If the local branch is master, then refresh it'
|
||||
|
@ -482,7 +482,7 @@ bash -c "(npm start >> '$LOG_DIR/{name}.log') 2>&1\
|
|||
|
||||
@classmethod
|
||||
def init_argument_parser(cls, parser):
|
||||
"""Initiaize command-line arguments."""
|
||||
"""Initialize command-line arguments."""
|
||||
parser.add_argument('--use_https', default=True, action='store_true',
|
||||
help='Use https when cloning github repositories.')
|
||||
parser.add_argument('--use_ssh', dest='use_https', action='store_false',
|
||||
|
|
Загрузка…
Ссылка в новой задаче