Skip to content
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

Revert "Fixing Python installation, Google Cloud SDK" #1250

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Revert "Fixing Python installation, Google Cloud SDK" #1250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion lib/dpl/providers/gcs.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class Gcs < Provider
opt '--cache_control HEADER', 'HTTP header Cache-Control to suggest that the browser cache the file.', see: 'https://cloud.google.com/storage/docs/xml-api/reference-headers#cachecontrol'
opt '--glob GLOB', default: '**/*'

cmds install: 'curl -L %{URL} | tar xz -C ~ && ~/google-cloud-sdk/install.sh --quiet --path-update false --usage-reporting false --command-completion false',
cmds install: 'curl -L %{URL} | tar xz -C ~ && ~/google-cloud-sdk/install.sh --path-update false --usage-reporting false --command-completion false',
login_key: 'gcloud auth activate-service-account --key-file=%{key_file}',
rsync: 'gsutil %{gs_opts} rsync %{rsync_opts} %{glob} %{target}',
copy: 'gsutil %{gs_opts} cp %{copy_opts} -r %{source} %{target}'
Expand Down
4 changes: 2 additions & 2 deletions spec/dpl/providers/gcs_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
describe 'by default', record: true do
it { should have_run 'mv /etc/boto.cfg /tmp/boto.cfg' }
it { should have_run '[validate:runtime] python (>= 2.7.9)' }
it { should have_run '[info] $ curl -L https://dl.google.com/dl/cloudsdk/channels/rapid/google-cloud-sdk.tar.gz | tar xz -C ~ && ~/google-cloud-sdk/install.sh --quiet --path-update false --usage-reporting false --command-completion false' }
it { should have_run 'curl -L https://dl.google.com/dl/cloudsdk/channels/rapid/google-cloud-sdk.tar.gz | tar xz -C ~ && ~/google-cloud-sdk/install.sh --quiet --path-update false --usage-reporting false --command-completion false' }
it { should have_run '[info] $ curl -L https://dl.google.com/dl/cloudsdk/channels/rapid/google-cloud-sdk.tar.gz | tar xz -C ~ && ~/google-cloud-sdk/install.sh --path-update false --usage-reporting false --command-completion false' }
it { should have_run 'curl -L https://dl.google.com/dl/cloudsdk/channels/rapid/google-cloud-sdk.tar.gz | tar xz -C ~ && ~/google-cloud-sdk/install.sh --path-update false --usage-reporting false --command-completion false' }
it { should have_run '[info] Authenticating with service account key file key.json' }
it { should have_run '[info] $ gcloud auth activate-service-account --key-file=key.json' }
it { should have_run 'gsutil cp -a "private" -r one gs://bucket/one' }
Expand Down