Commit 5e23e100 authored by Matija Čupić's avatar Matija Čupić

Merge branch '59570-update-image-name-apifuzzing' into 'master'

Update API Fuzzing image name to use SECURE_ANALYZERS_PREFIX

See merge request gitlab-org/gitlab!60059
parents 88a55788 eb7d97ad
---
title: Use SECURE_ANALYZERS_PREFIX variable for API Fuzzing
merge_request: 60059
author:
type: changed
...@@ -10,8 +10,8 @@ RSpec.describe 'API-Fuzzing.latest.gitlab-ci.yml' do ...@@ -10,8 +10,8 @@ RSpec.describe 'API-Fuzzing.latest.gitlab-ci.yml' do
describe 'the template file' do describe 'the template file' do
let(:template_filename) { Rails.root.join("lib/gitlab/ci/templates/" + template.full_name) } let(:template_filename) { Rails.root.join("lib/gitlab/ci/templates/" + template.full_name) }
let(:contents) { File.read(template_filename) } let(:contents) { File.read(template_filename) }
let(:production_registry) { 'registry.gitlab.com/gitlab-org/security-products/analyzers/api-fuzzing:${FUZZAPI_VERSION}-engine' } let(:production_registry) { '${SECURE_ANALYZERS_PREFIX}/api-fuzzing:${FUZZAPI_VERSION}' }
let(:staging_registry) { 'registry.gitlab.com/gitlab-org/security-products/analyzers/api-fuzzing-src:${FUZZAPI_VERSION}-engine' } let(:staging_registry) { '${SECURE_ANALYZERS_PREFIX}/api-fuzzing-src:${FUZZAPI_VERSION}' }
# Make sure future changes to the template use the production container registry. # Make sure future changes to the template use the production container registry.
# #
......
...@@ -16,7 +16,8 @@ variables: ...@@ -16,7 +16,8 @@ variables:
# available (non 500 response to HTTP(s)) # available (non 500 response to HTTP(s))
FUZZAPI_SERVICE_START_TIMEOUT: "300" FUZZAPI_SERVICE_START_TIMEOUT: "300"
# #
FUZZAPI_IMAGE: registry.gitlab.com/gitlab-org/security-products/analyzers/api-fuzzing:${FUZZAPI_VERSION}-engine SECURE_ANALYZERS_PREFIX: "registry.gitlab.com/gitlab-org/security-products/analyzers"
FUZZAPI_IMAGE: ${SECURE_ANALYZERS_PREFIX}/api-fuzzing:${FUZZAPI_VERSION}
# #
apifuzzer_fuzz_unlicensed: apifuzzer_fuzz_unlicensed:
...@@ -32,9 +33,7 @@ apifuzzer_fuzz_unlicensed: ...@@ -32,9 +33,7 @@ apifuzzer_fuzz_unlicensed:
apifuzzer_fuzz: apifuzzer_fuzz:
stage: fuzz stage: fuzz
image: image: $FUZZAPI_IMAGE
name: $FUZZAPI_IMAGE
entrypoint: ["/bin/bash", "-l", "-c"]
variables: variables:
FUZZAPI_PROJECT: $CI_PROJECT_PATH FUZZAPI_PROJECT: $CI_PROJECT_PATH
FUZZAPI_API: http://localhost:80 FUZZAPI_API: http://localhost:80
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment