diff --git a/integrations/docker/docker-ort-run.yml b/integrations/docker/docker-ort-run.yml index 872c4eec0e7cf..dac358adb79bb 100644 --- a/integrations/docker/docker-ort-run.yml +++ b/integrations/docker/docker-ort-run.yml @@ -35,6 +35,7 @@ steps: -v $(System.DefaultWorkingDirectory)/package-managers/settings.xml:/root/.m2/settings.xml \ -v $(System.DefaultWorkingDirectory)/netrc/.netrc:/root/.netrc \ --env ort__scanner__storages__postgresStorage__password=$(DB_PASSWORD) \ + --env ort__scanner__options__FossId__serverUrl=$(FOSSID_URL) \ --env ort__scanner__options__FossId__apiKey=$(FOSSID_API_KEY) \ --env ort__advisor__nexusiq__password=$(NEXUS_IQ_PASSWORD) \ --env JAVA_OPTS='-Xmx12g' \ diff --git a/integrations/ocass-ortpipeline.yml b/integrations/ocass-ortpipeline.yml index 8f1dde41081dd..3aea2a4ca41e2 100644 --- a/integrations/ocass-ortpipeline.yml +++ b/integrations/ocass-ortpipeline.yml @@ -49,16 +49,25 @@ parameters: default: "ScanCode" values: ["ScanCode", "fossid"] + - name: fossid_server + type: string + displayName: "FossID credentials variable group to use when running FossId (otherwise ignore)" + default: "fossid_credentials_test" + values: + - 'fossid_credentials_test' + - 'fossid_credentials_eb' + - 'fossid_credentials_io' + name: "${{parameters.project_name}} $(Date:yyyy-MM-dd) No $(Rev:.r)" variables: - group: ${{parameters.use_credentials}} + - group: ${{parameters.fossid_server}} - group: 'ort_config_credentials' - group: 'ort_db_credentials' - group: 'ort_nexus_iq_credentials' - group: 'maven_settings' - group: 'npm_settings' - - group: 'fossid_credentials' resources: repositories: diff --git a/integrations/stages/scan.yml b/integrations/stages/scan.yml index cc793ebd825df..12118b78e5cb2 100644 --- a/integrations/stages/scan.yml +++ b/integrations/stages/scan.yml @@ -36,6 +36,8 @@ parameters: type: string - name: scanner + type: string + default: "ScanCode" stages: - stage: scan_project