Re-architect only/except restrictions

lakedrops-execute.yml

@@ -38,6 +38,3 @@ Deploy:
 
 Reset Locales:
   extends: '.resetlocales'
-
-Release:
-  extends: '.createrelease'

lakedrops.yml

@@ -21,6 +21,9 @@ Validate Environment:
 Check 4 Updates:
   extends: '.check4update'
 
+Release:
+  extends: '.createrelease'
+
 LakeDrops:
   stage: execute
   variables:
@@ -29,10 +32,17 @@ LakeDrops:
     RESETLOCALE: ${RESETLOCALE}
     DEPLOYSCRIPT: ${DEPLOYSCRIPT}
     VERSIONPATTERN: ${VERSIONPATTERN}
-  only: !reference [.staging, only]
   trigger:
     include:
       - project: 'gitlab-ci-cd/drupal'
         ref: master
         file: '/lakedrops-execute.yml'
     strategy: depend
+  only: !reference [.staging, only]
+  except:
+    refs:
+      - tags
+    variables:
+      - $CI_COMMIT_MESSAGE =~ /^Merge tag /i
+      - $CAE
+      - $CHECKUPDATES

test-and-deploy.yml

@@ -173,6 +173,7 @@ stages:
     
     VERSIONPATTERN=$(date +"cd-%Y-%m-%d-%H-%M")
     echo "VERSIONPATTERN=${VERSIONPATTERN}" >> validation.env
+  only: !reference [.staging, only]
   except:
     variables:
       - $CAE
@@ -199,14 +200,6 @@ stages:
     name: build-prod
     when: always
     <<: *artifact_paths_prod
-  only: !reference [.staging, only]
-  except:
-    refs:
-      - tags
-    variables:
-      - $CI_COMMIT_MESSAGE =~ /^Merge tag /i
-      - $CAE
-      - $CHECKUPDATES
 
 .build:
   stage: build
@@ -235,14 +228,8 @@ stages:
     name: build
     when: always
     <<: *artifact_paths
-  only: !reference [.staging, only]
   except:
-    refs:
-      - tags
     variables:
-      - $CI_COMMIT_MESSAGE =~ /^Merge tag /i
-      - $CAE
-      - $CHECKUPDATES
       - $DISABLE_CI_TESTS
 
 .theme:
@@ -269,15 +256,9 @@ stages:
       - $THEME_CSS_PATH
   dependencies:
     - 'Build Prod Site'
-  only: !reference [.staging, only]
   except:
-    refs:
-      - tags
     variables:
       - $THEME_BUILD != "yes"
-      - $CI_COMMIT_MESSAGE =~ /^Merge tag /i
-      - $CAE
-      - $CHECKUPDATES
 
 .dumpdb:
   stage: build
@@ -295,16 +276,10 @@ stages:
     when: always
     paths:
       - ${CI_PROJECT_NAME}.sql
-  only: !reference [.staging, only]
   except:
-    refs:
-      - tags
     variables:
       - $DBREQUIRED == "no"
       - $INITIALINSTALL == "yes"
-      - $CI_COMMIT_MESSAGE =~ /^Merge tag /i
-      - $CAE
-      - $CHECKUPDATES
       - $DISABLE_CI_TESTS
 
 .importdb:
@@ -322,16 +297,10 @@ stages:
     - drush updatedb
     - drush config-import
     - drush cr
-  only: !reference [.staging, only]
   except:
-    refs:
-      - tags
     variables:
       - $DBREQUIRED == "no"
       - $INITIALINSTALL == "yes"
-      - $CI_COMMIT_MESSAGE =~ /^Merge tag /i
-      - $CAE
-      - $CHECKUPDATES
       - $DISABLE_CI_TESTS
   dependencies:
     - 'Build Site'
@@ -349,16 +318,10 @@ stages:
     - drush updatedb
     - drush config-import
     - drush cr
-  only: !reference [.staging, only]
   except:
-    refs:
-      - tags
     variables:
       - $DBREQUIRED != "no"
       - $INITIALINSTALL == "yes"
-      - $CI_COMMIT_MESSAGE =~ /^Merge tag /i
-      - $CAE
-      - $CHECKUPDATES
       - $DISABLE_CI_TESTS
   dependencies:
     - 'Build Site'
@@ -382,15 +345,9 @@ stages:
       - phpcs.xml
   dependencies:
     - 'Build Site'
-  only: !reference [.staging, only]
   except:
-    refs:
-      - tags
     variables:
       - $INITIALINSTALL == "yes"
-      - $CI_COMMIT_MESSAGE =~ /^Merge tag /i
-      - $CAE
-      - $CHECKUPDATES
       - $DISABLE_CI_TESTS
       - $DISABLE_CI_TEST_CODESTYLE
 
@@ -418,15 +375,9 @@ stages:
       junit: junit.xml
   dependencies:
     - 'Build Site'
-  only: !reference [.staging, only]
   except:
-    refs:
-      - tags
     variables:
       - $INITIALINSTALL == "yes"
-      - $CI_COMMIT_MESSAGE =~ /^Merge tag /i
-      - $CAE
-      - $CHECKUPDATES
       - $DISABLE_CI_TESTS
       - $DISABLE_CI_TEST_PHPUNIT
 
@@ -451,15 +402,9 @@ stages:
       - behat.xml
   dependencies:
     - 'Build Site'
-  only: !reference [.staging, only]
   except:
-    refs:
-      - tags
     variables:
       - $INITIALINSTALL == "yes"
-      - $CI_COMMIT_MESSAGE =~ /^Merge tag /i
-      - $CAE
-      - $CHECKUPDATES
       - $DISABLE_CI_TESTS
       - $DISABLE_CI_TEST_BEHAT
 
@@ -481,15 +426,9 @@ stages:
   dependencies:
     - 'Build Site'
     - 'Build Theme'
-  only: !reference [.staging, only]
   except:
-    refs:
-      - tags
     variables:
       - $INITIALINSTALL == "yes"
-      - $CI_COMMIT_MESSAGE =~ /^Merge tag /i
-      - $CAE
-      - $CHECKUPDATES
       - $DISABLE_CI_TESTS
       - $DISABLE_CI_TEST_BACKSTOP
 
@@ -507,14 +446,6 @@ stages:
   cache: {}
   dependencies:
     - 'Build Theme'
-  only: !reference [.staging, only]
-  except:
-    refs:
-      - tags
-    variables:
-      - $CI_COMMIT_MESSAGE =~ /^Merge tag /i
-      - $CAE
-      - $CHECKUPDATES
 
 .deployartefact:
   stage: deploy
@@ -531,14 +462,6 @@ stages:
   dependencies:
     - 'Build Prod Site'
     - 'Build Theme'
-  only: !reference [.staging, only]
-  except:
-    refs:
-      - tags
-    variables:
-      - $CI_COMMIT_MESSAGE =~ /^Merge tag /i
-      - $CAE
-      - $CHECKUPDATES
 
 .resetlocales:
   stage: finalize
@@ -549,15 +472,9 @@ stages:
   script:
     - ascr drupal-reset-locales ${CI_PROJECT_PATH} ${CI_COMMIT_REF_NAME}
   cache: {}
-  only: !reference [.staging, only]
   except:
-    refs:
-      - tags
     variables:
       - $RESETLOCALE == "no"
-      - $CI_COMMIT_MESSAGE =~ /^Merge tag /i
-      - $CAE
-      - $CHECKUPDATES
 
 .createrelease:
   stage: release