From 6a74357bfb81a895e4f770ebd643895398675ada Mon Sep 17 00:00:00 2001 From: =?utf8?q?Javier=20B=C3=A9rtoli?= Date: Fri, 19 Nov 2021 07:55:16 -0300 Subject: [PATCH] Fix licensing issues MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Arvados-DCO-1.1-Signed-off-by: Javier Bértoli --- .gitlab-ci.yml | 4 ++++ .licenseignore | 1 + .pre-commit-config.yaml | 4 ++++ .salt-lint | 4 ++++ Gemfile | 4 ++++ bin/install-hooks | 5 +++++ bin/kitchen | 5 +++++ test/integration/repo/controls/repo_spec.rb | 4 ++-- test/integration/shell/controls/repo_spec.rb | 4 ++++ 9 files changed, 33 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2d6bc2d..bd3fe29 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,9 @@ # -*- coding: utf-8 -*- # vim: ft=yaml + +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: Apache-2.0 --- ############################################################################### # Define all YAML node anchors diff --git a/.licenseignore b/.licenseignore index e3bce7d..3f41355 100644 --- a/.licenseignore +++ b/.licenseignore @@ -5,3 +5,4 @@ arvados/ruby/package/files/default/gpg-michal-papis-409B6B1796C275462A1703113804BB82D39DC0E3.key arvados/ruby/package/files/default/gpg-piotr-kuczynski-7D2BAF1CF37B13E2069D6956105BD0E739499BDB.key +Gemfile* diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 74381e2..efe2160 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,5 +1,9 @@ # -*- coding: utf-8 -*- # vim: ft=yaml + +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: Apache-2.0 --- # See https://pre-commit.com for more information # See https://pre-commit.com/hooks.html for more hooks diff --git a/.salt-lint b/.salt-lint index cfa12cf..059eb0a 100644 --- a/.salt-lint +++ b/.salt-lint @@ -1,5 +1,9 @@ # -*- coding: utf-8 -*- # vim: ft=yaml + +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: Apache-2.0 --- exclude_paths: [] rules: diff --git a/Gemfile b/Gemfile index 9774aac..bd28ddf 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,7 @@ +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: Apache-2.0 + # frozen_string_literal: true source 'https://rubygems.org' diff --git a/bin/install-hooks b/bin/install-hooks index 840bb6c..8348574 100755 --- a/bin/install-hooks +++ b/bin/install-hooks @@ -1,4 +1,9 @@ #!/usr/bin/env sh + +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: Apache-2.0 + set -o nounset # Treat unset variables as an error and immediately exit set -o errexit # If a command fails exit the whole script diff --git a/bin/kitchen b/bin/kitchen index dcfdb4c..981b899 100755 --- a/bin/kitchen +++ b/bin/kitchen @@ -1,4 +1,9 @@ #!/usr/bin/env ruby + +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: Apache-2.0 + # frozen_string_literal: true # diff --git a/test/integration/repo/controls/repo_spec.rb b/test/integration/repo/controls/repo_spec.rb index c112538..601119f 100644 --- a/test/integration/repo/controls/repo_spec.rb +++ b/test/integration/repo/controls/repo_spec.rb @@ -1,9 +1,9 @@ -# frozen_string_literal: true - # Copyright (C) The Arvados Authors. All rights reserved. # # SPDX-License-Identifier: Apache-2.0 +# frozen_string_literal: true + case os[:name] when 'centos' repo_file = '/etc/yum.repos.d/arvados.repo' diff --git a/test/integration/shell/controls/repo_spec.rb b/test/integration/shell/controls/repo_spec.rb index 0fdbdff..a9dc3cb 100644 --- a/test/integration/shell/controls/repo_spec.rb +++ b/test/integration/shell/controls/repo_spec.rb @@ -1,3 +1,7 @@ +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: Apache-2.0 + # frozen_string_literal: true case os[:name] -- 2.30.2