summaryrefslogtreecommitdiffstats
path: root/openecomp-be/dist
diff options
context:
space:
mode:
authorJoanna Jeremicz <joanna.jeremicz@nokia.com>2021-04-21 13:59:12 +0200
committerMichael Morris <michael.morris@est.tech>2021-05-14 14:58:14 +0000
commite3de4c9d214983d38a7d66e89dae5d4bba170ca3 (patch)
tree9f92e5fc15d06051ffff254588bbcc1e85214d3f /openecomp-be/dist
parentdf353be353e1ec25ac2a0e64a9eb617dcbc87703 (diff)
Integrate helm validator with SDC-BE
- Read helm validator configuration - Add call to helm validator during Helm validation - Add JUnit tests - Fix display message when CNF upload is unsuccessful - Show warning messages from validation after CNF upload Issue-ID: SDC-3185 Signed-off-by: Joanna Jeremicz <joanna.jeremicz@nokia.com> Change-Id: If197d557e6ddef4a07bef986d7cf133aedcb2cc5 Signed-off-by: Piotr Marcinkiewicz <piotr.marcinkiewicz@nokia.com>
Diffstat (limited to 'openecomp-be/dist')
-rw-r--r--openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/recipes/ON_5_setup_configuration.rb16
-rw-r--r--openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/templates/default/helmvalidator-configuration.yaml.erb6
2 files changed, 22 insertions, 0 deletions
diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/recipes/ON_5_setup_configuration.rb b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/recipes/ON_5_setup_configuration.rb
index e7048427c7..17495687c8 100644
--- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/recipes/ON_5_setup_configuration.rb
+++ b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/recipes/ON_5_setup_configuration.rb
@@ -42,6 +42,22 @@ template "VnfrepoConfiguration" do
end
+template "HelmValidatorConfiguration" do
+ path "#{ENV['JETTY_BASE']}/config/onboarding-be/config-helmvalidator.yaml"
+ source "helmvalidator-configuration.yaml.erb"
+ owner "jetty"
+ group "jetty"
+ mode "0755"
+ variables({
+ :HVALIDATOR_ENABLED => node['HelmValidator']['validator_enabled'],
+ :HVALIDATOR_URL => node['HelmValidator']['validator_url'],
+ :HVALIDATOR_HELM_VERSION => node['HelmValidator']['helm_version'],
+ :HVALIDATOR_DEPLOYABLE => node['HelmValidator']['deployable'],
+ :HVALIDATOR_LINTABLE => node['HelmValidator']['lintable'],
+ :HVALIDATOR_STRICT_LINTABLE => node['HelmValidator']['strict_lintable']
+ })
+end
+
template "ExternalTestingConfiguration" do
path "#{ENV['JETTY_BASE']}/config/onboarding-be/externaltesting-configuration.yaml"
diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/templates/default/helmvalidator-configuration.yaml.erb b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/templates/default/helmvalidator-configuration.yaml.erb
new file mode 100644
index 0000000000..37021c7a9a
--- /dev/null
+++ b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/templates/default/helmvalidator-configuration.yaml.erb
@@ -0,0 +1,6 @@
+hValidatorEnabled: <%= @HVALIDATOR_ENABLED %>
+hValidatorUrl: <%= @HVALIDATOR_URL %>
+hValidatorVersion: <%= @HVALIDATOR_HELM_VERSION %>
+hValidatorDeployable: <%= @HVALIDATOR_DEPLOYABLE %>
+hValidatorLintable: <%= @HVALIDATOR_LINTABLE %>
+hValidatorStrictLintable: <%= @HVALIDATOR_STRICT_LINTABLE %>