Pin tests to git hash

14 files changed, 14 insertions, 86 deletions

diff --git a/.gitlab/test.yml b/.gitlab/test.yml
index 1940d57..5f32fcd 100644
--- a/.gitlab/test.yml
+++ b/.gitlab/test.yml
@@ -122,75 +122,3 @@ integration-rust:
   variables:
     RSPEC_DIR: spec/integration/rust
   needs: ['build-docker-image']
-
-.functional:
-  stage: test
-  trigger: gitlab-org/security-products/tests/common
-  variables:
-    CONTAINER_SCANNING_DISABLED: 'true'
-    DAST_DISABLED: 'true'
-    DEPENDENCY_SCANNING_DISABLED: 'true'
-    DS_DEFAULT_ANALYZERS: ''
-    LICENSE_MANAGEMENT_VERSION: $CI_COMMIT_SHA
-    SAST_DEFAULT_ANALYZERS: ''
-    SAST_DISABLED: 'true'
-  rules:
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-      when: always
-      allow_failure: true
-
-functional-c-conan:
-  extends: .functional
-  trigger: gitlab-org/security-products/tests/c-conan
-
-functional-csharp-nuget-dotnetcore:
-  extends: .functional
-  trigger: gitlab-org/security-products/tests/csharp-nuget-dotnetcore
-
-functional-go-modules:
-  extends: .functional
-  trigger: gitlab-org/security-products/tests/go-modules
-
-functional-java-gradle:
-  extends: .functional
-  trigger: gitlab-org/security-products/tests/java-gradle
-
-functional-java-maven-multimodules:
-  extends: .functional
-  trigger: gitlab-org/security-products/tests/java-maven-multimodules
-
-functional-java-maven:
-  extends: .functional
-  trigger: gitlab-org/security-products/tests/java-maven
-
-functional-js-bower:
-  extends: .functional
-  trigger: gitlab-org/security-products/tests/js-bower
-
-functional-js-npm:
-  extends: .functional
-  trigger: gitlab-org/security-products/tests/js-npm
-
-functional-js-yarn:
-  extends: .functional
-  trigger: gitlab-org/security-products/tests/js-yarn
-
-functional-ruby-bundler_js-yarn:
-  extends: .functional
-  trigger: gitlab-org/security-products/tests/ruby-bundler_js-yarn
-
-functional-php-composer:
-  extends: .functional
-  trigger: gitlab-org/security-products/tests/php-composer
-
-functional-python-pip:
-  extends: .functional
-  trigger: gitlab-org/security-products/tests/python-pip
-
-functional-ruby-bundler:
-  extends: .functional
-  trigger: gitlab-org/security-products/tests/ruby-bundler
-
-functional-rust-cargo:
-  extends: .functional
-  trigger: gitlab-org/security-products/tests/rust-cargo
diff --git a/spec/integration/c/conan_spec.rb b/spec/integration/c/conan_spec.rb
index 693b83a..b8f84c9 100644
--- a/spec/integration/c/conan_spec.rb
+++ b/spec/integration/c/conan_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe "conan" do
 
   let(:env) { {} }
 
-  include_examples "each report version", "c", "conan"
+  include_examples "each report version", "c", "conan", "754965b0"
 
   context "when scanning a C++ project" do
     let(:env) { { 'LICENSE_FINDER_CLI_OPTS' => '--project-path=libraries/poco/md5' } }
diff --git a/spec/integration/dotnet/nuget_spec.rb b/spec/integration/dotnet/nuget_spec.rb
index 849011e..b7890a5 100644
--- a/spec/integration/dotnet/nuget_spec.rb
+++ b/spec/integration/dotnet/nuget_spec.rb
@@ -12,7 +12,7 @@ RSpec.describe "nuget" do
     system("rm -fr /opt/gitlab/.nuget/packages")
   end
 
-  include_examples "each report version", "csharp", "nuget-dotnetcore"
+  include_examples "each report version", "csharp", "nuget-dotnetcore", "36f35e8a"
 
   context "when a project has a nuget packages.config file in the root" do
     let(:packages_config) do
diff --git a/spec/integration/go/modules_spec.rb b/spec/integration/go/modules_spec.rb
index 3c2daf1..034f454 100644
--- a/spec/integration/go/modules_spec.rb
+++ b/spec/integration/go/modules_spec.rb
@@ -13,7 +13,7 @@ RSpec.describe "modules" do
     system('rm -fr /opt/asdf/installs/golang/**/packages/pkg/')
   end
 
-  include_examples "each report version", "go", "modules"
+  include_examples "each report version", "go", "modules", "66bc04cf"
 
   ['1.11', '1.12', '1.13', '1.14', '1.15', '1.15.1'].each do |version|
     context "when scanning a go.mod and go.sum files with v#{version}" do
diff --git a/spec/integration/java/gradle_spec.rb b/spec/integration/java/gradle_spec.rb
index dd0ba26..108c915 100644
--- a/spec/integration/java/gradle_spec.rb
+++ b/spec/integration/java/gradle_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe "gradle" do
 
   let(:env) { {} }
 
-  include_examples "each report version", "java", "gradle"
+  include_examples "each report version", "java", "gradle", "dca34b80"
 
   context "when running a default gradle build" do
     before do
diff --git a/spec/integration/java/maven_spec.rb b/spec/integration/java/maven_spec.rb
index 95a6cb0..72fec6d 100644
--- a/spec/integration/java/maven_spec.rb
+++ b/spec/integration/java/maven_spec.rb
@@ -7,8 +7,8 @@ RSpec.describe "maven" do
 
   let(:env) { {} }
 
-  include_examples "each report version", "java", "maven"
-  include_examples "each report version", "java", "maven-multimodules"
+  include_examples "each report version", "java", "maven", "b29564b2"
+  include_examples "each report version", "java", "maven-multimodules", "95b49a9a"
 
   context "when the maven dependencies come from the same projects public maven repository" do
     let(:env) { { 'CI_PROJECT_ID' => '18446184' } }
diff --git a/spec/integration/js/bower_spec.rb b/spec/integration/js/bower_spec.rb
index d49353c..887694f 100644
--- a/spec/integration/js/bower_spec.rb
+++ b/spec/integration/js/bower_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 RSpec.describe "bower" do
-  include_examples "each report version", "js", "bower"
+  include_examples "each report version", "js", "bower", "d36902e5"
 
   context "when scanning a simple bower project" do
     subject { runner.scan }
diff --git a/spec/integration/js/npm_spec.rb b/spec/integration/js/npm_spec.rb
index b61aa0f..69c806b 100644
--- a/spec/integration/js/npm_spec.rb
+++ b/spec/integration/js/npm_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 RSpec.describe "npm" do
-  include_examples "each report version", "js", "npm"
+  include_examples "each report version", "js", "npm", "e80dba9c"
 
   context 'when scanning a project with no dependencies' do
     subject { runner.scan }
diff --git a/spec/integration/js/yarn_spec.rb b/spec/integration/js/yarn_spec.rb
index 9f0ff56..aceb0d2 100644
--- a/spec/integration/js/yarn_spec.rb
+++ b/spec/integration/js/yarn_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 RSpec.describe "yarn" do
-  include_examples "each report version", "js", "yarn"
+  include_examples "each report version", "js", "yarn", "4566ffe7"
 
   context "when scanning a yarn.lock with a single dependency" do
     subject { runner.scan }
diff --git a/spec/integration/php/composer_spec.rb b/spec/integration/php/composer_spec.rb
index 685e5ad..de5c62f 100644
--- a/spec/integration/php/composer_spec.rb
+++ b/spec/integration/php/composer_spec.rb
@@ -11,7 +11,7 @@ RSpec.describe "composer" do
     system("rm -rf /opt/asdf/installs/php/**/.composer")
   end
 
-  include_examples "each report version", "php", "composer"
+  include_examples "each report version", "php", "composer", "f65a9cf0"
 
   context "when the project's dependencies require php-gd e.g. in the case of Drupal" do
     before do
diff --git a/spec/integration/python/pipenv_spec.rb b/spec/integration/python/pipenv_spec.rb
index f13bd31..2f235a3 100644
--- a/spec/integration/python/pipenv_spec.rb
+++ b/spec/integration/python/pipenv_spec.rb
@@ -11,7 +11,7 @@ RSpec.describe "pipenv" do
     system('rm -fr /opt/asdf/installs/python')
   end
 
-  include_examples "each report version", "python", "pipenv", "pip-file-lock"
+  include_examples "each report version", "python", "pipenv", "b26f0561"
 
   context "when a project depends on a version 6 Pipfile.lock" do
     let(:pipfile_lock_content) do
diff --git a/spec/integration/ruby/bundler_spec.rb b/spec/integration/ruby/bundler_spec.rb
index 2444ec4..ffd6bd9 100644
--- a/spec/integration/ruby/bundler_spec.rb
+++ b/spec/integration/ruby/bundler_spec.rb
@@ -11,7 +11,7 @@ RSpec.describe "bundler" do
     system('rm -fr /opt/asdf/installs/ruby')
   end
 
-  include_examples "each report version", "ruby", "bundler"
+  include_examples "each report version", "ruby", "bundler", "8194b658"
 
   context "when the project depends on an older version of ruby specified in a `.ruby-version` file" do
     before do
diff --git a/spec/integration/rust/cargo_spec.rb b/spec/integration/rust/cargo_spec.rb
index c4ee6fa..440d3ac 100644
--- a/spec/integration/rust/cargo_spec.rb
+++ b/spec/integration/rust/cargo_spec.rb
@@ -12,7 +12,7 @@ RSpec.describe "cargo" do
     system("rm -r #{install_dir}") if Dir.exist?(install_dir)
   end
 
-  include_examples "each report version", "rust", "cargo"
+  include_examples "each report version", "rust", "cargo", "1a7c2572"
 
   context "when scanning a cargo project" do
     before do
diff --git a/spec/support/shared.rb b/spec/support/shared.rb
index 28eb8c3..653c7d8 100644
--- a/spec/support/shared.rb
+++ b/spec/support/shared.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.shared_examples "each report version" do |language, package_manager, branch = 'master'|
+RSpec.shared_examples "each report version" do |language, package_manager, branch|
   ['1.0', '1.1', '2.0', '2.1'].each do |version|
     context "when generating a `#{version}` report for #{package_manager}" do
       subject { runner.scan(env: { 'LM_REPORT_VERSION' => version }) }