Merge branch 'fix-skip-ee-check-for-master' into 'master'

Skip master for EE-specific check

See merge request gitlab-org/gitlab-ee!5542

.gitlab-ci.yml

@@ -447,29 +447,27 @@ retrieve-tests-metadata:
     - wget -O $EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH http://${TESTS_METADATA_S3_BUCKET}.s3.amazonaws.com/$EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH || rm $EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH
     - '[[ -f $EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH ]] || echo "{}" > ${EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH}'
 
-ee-files-location-check:
+.ee-specific-check: &ee-specific-check
   <<: *dedicated-runner
   stage: test
   before_script: []
   cache: {}
   retry: 0
-  script:
-    - scripts/ee-files-location-check
   only:
     - branches
     - //@gitlab-org/gitlab-ee
+  except:
+    - master
+
+ee-files-location-check:
+  <<: *ee-specific-check
+  script:
+    - scripts/ee-files-location-check
 
 ee-specific-lines-check:
-  <<: *dedicated-runner
-  stage: test
-  before_script: []
-  cache: {}
-  retry: 0
+  <<: *ee-specific-check
   script:
     - scripts/ee-specific-lines-check
-  only:
-    - branches
-    - //@gitlab-org/gitlab-ee
 
 update-tests-metadata:
   <<: *tests-metadata-state