Merge branch 'hotfix-correct-multi-target' into 'master'

Correct how jobs are disabled for multi-stage

See merge request !114

README.md

@@ -41,7 +41,7 @@ and to do so creates a child pipeline to run the actual build.
 
 If the common pipeline being added should run once only in the parent pipeline
 it must be explicitly disabled under [the multi target
-definition](auto-devops/multi-target-docker-images.gitlab-ci.yml).
+fragment](fragments/multi-target-docker-images/multiple-docker-images.gitlab-ci.yml).
 
 ## Specific documentation
 

auto-devops/multi-target-docker-images.gitlab-ci.yml

@@ -37,10 +37,3 @@ include:
   - local: "/fragments/multi-target-docker-images/overwrites.gitlab-ci.yml"
     rules:
       - if: $MULTI_DOCKER_IMAGE_BUILD_ENABLED && $CI_PIPELINE_SOURCE == "parent_pipeline"
-
-variables:
-  # Disabled Auto DevOps jobs which do not need to be duplicated in multi-image child pipelines.
-  DEPENDENCY_SCANNING_DISABLED: $MULTI_DOCKER_IMAGE_BUILD_ENABLED
-  SAST_DISABLED: $MULTI_DOCKER_IMAGE_BUILD_ENABLED
-  PRE_COMMIT_DISABLED: $MULTI_DOCKER_IMAGE_BUILD_ENABLED
-  RELEASE_IT_DISABLED: $MULTI_DOCKER_IMAGE_BUILD_ENABLED

fragments/multi-target-docker-images/multiple-docker-images.gitlab-ci.yml

@@ -33,6 +33,7 @@ multiple-docker-images:
     PRE_COMMIT_DISABLED: "1"
     CODE_QUALITY_DISABLED: "1"
     SECRET_DETECTION_DISABLED: "1"
+    RELEASE_IT_DISABLED: "1"
   parallel:
     matrix:
       - DOCKER_BUILD_TARGET: $[[ inputs.docker_build_targets ]]