Skip to content

Commit

Permalink
Increasing timeouts for ssh in molecule gce and bumping versions (#310)
Browse files Browse the repository at this point in the history
* Increasing timeouts for ssh in molecule gce plugin and bumping molecule version

Signed-off-by: Rado Chmiel <[email protected]>

* Update test-requirements.txt

* change GCE zone back to us-central1-c

There seem to be some limits on current zone, switching back to original

---------

Signed-off-by: Rado Chmiel <[email protected]>
  • Loading branch information
radoslawc authored Nov 25, 2024
1 parent 9b0df72 commit 0b3e51d
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 27 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ driver:
service_account_file: $GOOGLE_JSON_KEY_LOCATION
external_access: true
instance_os_type: linux
ssh_connection_options:
- '-o ConnectTimeout=120'
- '-o ServerAliveInterval=15'
- '-o ServerAliveCountMax=5'
lint: |
set -e
PATH=${PATH}
Expand Down
52 changes: 26 additions & 26 deletions e2e/provision/test-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,30 @@
#
# pip-compile --output-file=test-requirements.txt test-requirements.in
#
ansible-compat==24.6.1
ansible-compat==24.9.1
# via
# ansible-lint
# molecule
ansible-core==2.17.1
ansible-core==2.17.4
# via
# ansible-compat
# ansible-lint
# molecule
ansible-lint==24.6.1
ansible-lint==24.9.2
# via -r test-requirements.in
attrs==23.2.0
attrs==24.2.0
# via
# jsonschema
# referencing
black==24.4.2
black==24.8.0
# via ansible-lint
bracex==2.4
bracex==2.5.post1
# via wcmatch
cachetools==5.3.3
cachetools==5.5.0
# via google-auth
certifi==2024.6.2
certifi==2024.8.30
# via requests
cffi==1.16.0
cffi==1.17.1
# via cryptography
charset-normalizer==3.3.2
# via requests
Expand All @@ -38,25 +38,25 @@ click==8.1.7
# molecule
click-help-colors==0.9.4
# via molecule
cryptography==42.0.8
cryptography==43.0.1
# via ansible-core
enrich==1.2.7
# via molecule
filelock==3.15.3
filelock==3.16.1
# via ansible-lint
google-auth==2.30.0
google-auth==2.35.0
# via -r test-requirements.in
idna==3.7
idna==3.10
# via requests
importlib-metadata==7.2.0
importlib-metadata==8.5.0
# via ansible-lint
iniconfig==2.0.0
# via pytest
jinja2==3.1.4
# via
# ansible-core
# molecule
jsonschema==4.22.0
jsonschema==4.23.0
# via
# ansible-compat
# ansible-lint
Expand All @@ -69,7 +69,7 @@ markupsafe==2.1.5
# via jinja2
mdurl==0.1.2
# via markdown-it-py
molecule==24.6.0
molecule==24.9.0
# via
# -r test-requirements.in
# molecule-plugins
Expand All @@ -90,29 +90,29 @@ pathspec==0.12.1
# ansible-lint
# black
# yamllint
platformdirs==4.2.2
platformdirs==4.3.6
# via black
pluggy==1.5.0
# via
# molecule
# pytest
pyasn1==0.6.0
pyasn1==0.6.1
# via
# pyasn1-modules
# rsa
pyasn1-modules==0.4.0
pyasn1-modules==0.4.1
# via google-auth
pycparser==2.22
# via cffi
pygments==2.18.0
# via rich
pytest==8.2.2
pytest==8.3.3
# via pytest-testinfra
pytest-testinfra==10.1.1
# via -r test-requirements.in
python-vagrant==1.0.0
# via molecule-plugins
pyyaml==6.0.1
pyyaml==6.0.2
# via
# ansible-compat
# ansible-core
Expand All @@ -127,12 +127,12 @@ requests==2.32.3
# via -r test-requirements.in
resolvelib==1.0.1
# via ansible-core
rich==13.7.1
rich==13.9.1
# via
# ansible-lint
# enrich
# molecule
rpds-py==0.18.1
rpds-py==0.20.0
# via
# jsonschema
# referencing
Expand All @@ -146,15 +146,15 @@ subprocess-tee==0.4.2
# via
# ansible-compat
# ansible-lint
urllib3==2.2.2
urllib3==2.2.3
# via requests
wcmatch==8.5.2
wcmatch==10.0
# via
# ansible-lint
# molecule
yamllint==1.35.1
# via
# -r test-requirements.in
# ansible-lint
zipp==3.19.2
zipp==3.20.2
# via importlib-metadata
2 changes: 1 addition & 1 deletion e2e/terraform/modules/gcp/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ variable "region" {

variable "zone" {
description = "GCP zone to deploy CI instances"
default = "europe-west9-a"
default = "us-central1-c"
type = string
}

Expand Down

0 comments on commit 0b3e51d

Please sign in to comment.