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.

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

Halyard: Support loading BOM from disk rather than GCS #2390 #894

Merged
merged 19 commits into from
Apr 6, 2018
Merged

Halyard: Support loading BOM from disk rather than GCS #2390 #894

merged 19 commits into from
Apr 6, 2018

Conversation

mracter
Copy link
Contributor

@mracter mracter commented Apr 6, 2018

mracter and others added 9 commits March 28, 2018 15:51
…a BOM from a configurable path on the local disk if the specified Spinnaker version starts with 'local:'.
…der to read artefact profiles from the local BOM path.
… localDiskProfileReader behaves correctly with well-formed and malformed paths, and checking if localDiskProfileReader performs correctly when reading files from tar archive.
…ocaldisk-tests

Feature/read bom from localdisk tests
…ocaldisk

Add feature to read Bill of Materials from a location on disk, with basic unit tests.
Copy link
Member

@lwander lwander left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great work! This is something we dearly needed.

@@ -1,6 +1,6 @@
#Mon Dec 11 14:43:59 EST 2017
#Tue Apr 03 13:32:29 SAST 2018
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think your build system/IDE made these changes. Can you back these out?

gradlew Outdated
@@ -1,17 +1,35 @@
#!/usr/bin/env bash
#!/usr/bin/env sh
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think your build system/IDE made these changes. Can you back these out?

gradlew.bat Outdated
@@ -8,14 +8,14 @@
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal

@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think your build system/IDE made these changes. Can you back these out?

return new FileInputStream(objectName);
}

}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be unindented

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed tabstops.

@@ -0,0 +1,113 @@
/*
* Copyright 2017 Google, Inc.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should make this 2018, and your company or name

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed

@@ -0,0 +1,122 @@
/*
* Copyright 2017 Google, Inc.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same comment here about updating this.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed

@@ -67,7 +72,7 @@ String gitRoot(@Value("${git.root:~/dev/spinnaker}") String gitRoot) {
}

@Bean
String spinnakerStagingDependencyPath(@Value("${spinnaker.config.staging.directory:~/.halyard}") String path) {
String spinnakerStagingDependencyPath(@Value("${spinnaker.config.staging.directory:~/.hal}") String path) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this fixing an outstanding bug, or a change for this feature?

@lwander
Copy link
Member

lwander commented Apr 6, 2018

Once this is merged, would you be OK if I make some more changes around this, namely stopping all requests to the global versions.yml file, preferring the local copy if a local version is selected?

Copy link
Member

@lwander lwander left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@lwander lwander merged commit be66b71 into spinnaker:master Apr 6, 2018
@Tharun-Sabbu
Copy link

Can you please provide the documentation on how to achieve the offline installation of spinnaker.

Thanks

@snapfast
Copy link

@Tharun-Sabbu still looking for it. Do you have a link for me after 2 years ?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants