-
Notifications
You must be signed in to change notification settings - Fork 658
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Use nats-server blob instead of downloading gnatsd
The nats-server binary replaced the legacy forked gnatsd binary in 2022: #2391 However, the integration specs were still using an old version of gnatsd from an S3 bucket. Now, the integration specs use the current nats-server blob directly. This required that the nats-sync process also be launched during integration tests in order to allow agents to connect. Additionally, there was a race condition between an agent being launched by the Dummy CPI and the nats-sync process adding the agent to the nats-server config.
- Loading branch information
Showing
8 changed files
with
181 additions
and
146 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
<%= | ||
|
||
authentication = if user_authentication == 'uaa' | ||
# Pulled from src/spec/assets/uaa_config/asymmetric/uaa.yml | ||
{ | ||
'user' => '', | ||
'password' => '', | ||
'client_id' => 'nats-sync', | ||
'client_secret' => 'secret' | ||
} | ||
else | ||
# Pulled from src/spec/assets/sandbox/director_test.yml.erb | ||
{ | ||
'user' => 'test', | ||
'password' => 'test', | ||
'client_id' => '', | ||
'client_secret' => '' | ||
} | ||
end | ||
|
||
director = authentication.merge({ | ||
'url' => director_url, | ||
'ca_cert' => uaa_ca_cert_path, | ||
'director_subject_file' => nats_sync_director_subject_file_path, | ||
'hm_subject_file' => nats_sync_hm_subject_file_path, | ||
}) | ||
|
||
params = { | ||
'director' => director, | ||
'intervals' => { | ||
# Set to a low value to ensure VMs are authorized before they connect. | ||
'poll_user_sync' => 1, | ||
}, | ||
'nats' => { | ||
'config_file_path' => nats_sync_auth_json_path, | ||
'nats_server_executable' => nats_server_executable_path, | ||
'nats_server_pid_file' => nats_server_pid_path, | ||
}, | ||
'logfile' => nats_sync_log_path, | ||
} | ||
|
||
YAML.dump(params) | ||
|
||
%> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
15 changes: 0 additions & 15 deletions
15
src/spec/integration_support/artifact_installer_install_binary.sh
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.