Resolve BMK-595

Closes BMK-595

.gitlab-ci.yml

@@ -3,14 +3,42 @@ stages:
 - test-hepwlbuilder
 - test-parsers
 - build-hepwl
-      
+- openMr
+
+
+openMr:
+  image: $CI_REGISTRY_IMAGE/hep-workload-builder:latest
+  stage: openMr
+  tags:
+    - hep-workload-docker-builder # for private runners
+  only:
+    variables:
+      - $CI_COMMIT_BRANCH =~ /^qa.*$/
+  variables:
+    TARGET_BRANCH: master
+  script:
+      - | 
+          BODY="{
+            \"id\": ${CI_PROJECT_ID},
+            \"source_branch\": \"${CI_COMMIT_BRANCH}\",
+            \"target_branch\": \"${TARGET_BRANCH}\",
+            \"title\": \"merge ${CI_COMMIT_BRANCH} commit ${CI_COMMIT_SHORT_SHA} from ${CI_PIPELINE_ID}\"
+          }";
+
+      - |
+        curl -X POST "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/merge_requests" \
+          --header "PRIVATE-TOKEN:${CI_PRIVATE_TOKEN}" \
+          --header "Content-Type: application/json" \
+          --data "${BODY}"
+
+
 # Build the hep-workload-builder image (which is used to build and test WLs using docker)
 # Use new CERN ci-tools (July 2019, BMK-113): see https://cern.service-now.com/service-portal/article.do?n=KB0005851
 # Adapted from https://gitlab.cern.ch/gitlabci-examples/build_docker_image/blob/master/.gitlab-ci.yml
 # [NB With the old ci-tools, the build cache seems to be ignored all the time on shared runners, i.e. yum install always runs]
 # Kaniko is the recommended method for running Docker-builds as of May 2019. 
 # See https://docs.gitlab.com/ee/ci/docker/using_kaniko.html for GitLab's documentation.
-job_build-hepwlbuilder:
+build-hepwlbuilder:
   stage: build-hepwlbuilder
   image: # NB enable shared runners and do not specify a CI tag
     name: gitlab-registry.cern.ch/ci-tools/docker-image-builder # CERN version of the Kaniko image
@@ -86,52 +114,32 @@ job_test-hepwlbuilder-kv:
 ### ALICE
 ###
 
-job_build-alice-gen-sim:
+build-alice-gen-sim:
   variables:
     CIENV_HEPWL_SPECFILE: $CI_PROJECT_DIR/alice/gen-sim/alice-gen-sim.spec
   only:
-    refs:
-    - qa
-    changes:
-    - alice/gen-sim/*
-    - alice/gen-sim/*/*
-    #- common/bmk-driver.sh
-    #- common/Dockerfile.template
+    variables:
+    - $CI_COMMIT_BRANCH == "qa-build-alice-gen-sim"
   <<: *build-hepwl-anchor
   
 ###
 ### ATLAS
 ###
 
-job_build-atlas-kv:
+build-atlas-kv:
   variables:
     CIENV_HEPWL_SPECFILE: $CI_PROJECT_DIR/atlas/kv/atlas-kv.spec
   only:
-    refs:
-    - qa
-    changes:
-    - atlas/kv/*
-    - atlas/kv/*/*
-  except: # prevent unnecessary KV rebuild if already done in test-hepwlbuilder stage (BMK-119)
-    changes:
-    - .gitlab-ci.*
-    - build-executor/*
-    - build-executor/*/*
-    - common/bmk-driver.sh
-    - common/Dockerfile.template
+    variables:
+    - $CI_COMMIT_BRANCH == "qa-build-atlas-kv"
   <<: *build-hepwl-anchor
 
-job_build-atlas-gen:
+build-atlas-gen:
   variables:
     CIENV_HEPWL_SPECFILE: $CI_PROJECT_DIR/atlas/gen/atlas-gen.spec
   only:
-    refs:
-    - qa
-    changes:
-    - atlas/gen/*
-    - atlas/gen/*/*
-    #- common/bmk-driver.sh
-    #- common/Dockerfile.template
+    variables:
+    - $CI_COMMIT_BRANCH == "qa-build-atlas-gen"
   <<: *build-hepwl-anchor
 
 build-atlas-sim:
@@ -139,7 +147,7 @@ build-atlas-sim:
     CIENV_HEPWL_SPECFILE: $CI_PROJECT_DIR/atlas/sim/atlas-sim.spec
   only:
     variables:
-    - $CI_COMMIT_BRANCH =~ /^qa-build-atlas-sim$/
+    - $CI_COMMIT_BRANCH == "qa-build-atlas-sim"
   <<: *build-hepwl-anchor
 
 build-atlas-digi-reco:
@@ -147,51 +155,36 @@ build-atlas-digi-reco:
     CIENV_HEPWL_SPECFILE: $CI_PROJECT_DIR/atlas/digi-reco/atlas-digi-reco.spec
   only:
     variables:
-    - $CI_COMMIT_BRANCH == "qa-${CI_JOB_NAME}"
+    - $CI_COMMIT_BRANCH == "qa-build-atlas-digi-reco"
   <<: *build-hepwl-anchor
 
 ###
 ### CMS
 ###
 
-job_build-cms-gen-sim:
+build-cms-gen-sim:
   variables:
     CIENV_HEPWL_SPECFILE: $CI_PROJECT_DIR/cms/gen-sim/cms-gen-sim.spec
   only:
-    refs:
-    - qa
-    changes:
-    - cms/gen-sim/*
-    - cms/gen-sim/*/*
-    #- common/bmk-driver.sh
-    #- common/Dockerfile.template
+    variables:
+    - $CI_COMMIT_BRANCH == "qa-build-cms-gen-sim"
   <<: *build-hepwl-anchor
 
 
-job_build-cms-digi:
+build-cms-digi:
   variables:
     CIENV_HEPWL_SPECFILE: $CI_PROJECT_DIR/cms/digi/cms-digi.spec
   only:
-    refs:
-    - qa
-    changes:
-    - cms/digi/*
-    - cms/digi/*/*
-    #- common/bmk-driver.sh
-    #- common/Dockerfile.template
+    variables:
+    - $CI_COMMIT_BRANCH == "qa-build-cms-digi"
   <<: *build-hepwl-anchor
 
-job_build-cms-reco:
+build-cms-reco:
   variables:
     CIENV_HEPWL_SPECFILE: $CI_PROJECT_DIR/cms/reco/cms-reco.spec
   only:
-    refs:
-    - qa
-    changes:
-    - cms/reco/*
-    - cms/reco/*/*
-    #- common/bmk-driver.sh
-    #- common/Dockerfile.template
+    variables:
+    - $CI_COMMIT_BRANCH == "qa-build-cms-reco"
   <<: *build-hepwl-anchor
 
 
@@ -199,17 +192,12 @@ job_build-cms-reco:
 ### LHCb
 ###
 
-job_build-lhcb-gen-sim:
+build-lhcb-gen-sim:
   variables:
     CIENV_HEPWL_SPECFILE: $CI_PROJECT_DIR/lhcb/gen-sim/lhcb-gen-sim.spec
   only:
-    refs:
-    - qa
-    changes:
-    - lhcb/gen-sim/*
-    - lhcb/gen-sim/*/*
-    #- common/bmk-driver.sh
-    #- common/Dockerfile.template
+    variables:
+    - $CI_COMMIT_BRANCH == "qa-build-lhcb-gen-sim"
   <<: *build-hepwl-anchor
 
 ###