consolidate docker CI stages where applicable, add gstlal/gstlal-ugly images

.gitlab-ci.yml

@@ -152,7 +152,7 @@ level2:rpm:gstlal-burst:
 
 # Docker Images
 
-docker:el7:
+.docker:rpm: &docker-rpm
   interruptible: true
   stage: docker
   before_script: [ ]
@@ -170,18 +170,63 @@ docker:el7:
     - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
     - docker build --pull -t $DOCKER_BRANCH --file .gitlab-ci.Dockerfile.e7 .
     - docker push $DOCKER_BRANCH
+  only:
+    - schedules
+    - pushes
+
+docker:el7:
+  <<: *docker-rpm
   needs:
     - level0:rpm:gstlal
     - level1:rpm:gstlal-ugly
     - level2:rpm:gstlal-calibration
     - level2:rpm:gstlal-inspiral
     - level2:rpm:gstlal-burst
-  only:
-    - schedules
-    - pushes
   except:
     - /gstlal-([a-z]+-|)[0-9]+\.[0-9]+\.[0-9]+-v[0-9]+/
 
+docker:release:gstlal:el7:
+  <<: *docker-rpm
+  needs:
+    - level0:rpm:gstlal
+  only:
+    - /gstlal-[0-9]+\.[0-9]+\.[0-9]+-v[0-9]+/
+
+docker:release:gstlal-ugly:el7:
+  <<: *docker-rpm
+  needs:
+    - level0:rpm:gstlal
+    - level1:rpm:gstlal-ugly
+  only:
+    - /gstlal-ugly-[0-9]+\.[0-9]+\.[0-9]+-v[0-9]+/
+
+docker:release:gstlal-inspiral:el7:
+  <<: *docker-rpm
+  needs:
+    - level0:rpm:gstlal
+    - level1:rpm:gstlal-ugly
+    - level2:rpm:gstlal-inspiral
+  only:
+    - /gstlal-inspiral-[0-9]+\.[0-9]+\.[0-9]+-v[0-9]+/
+
+docker:release:gstlal-burst:el7:
+  <<: *docker-rpm
+  needs:
+    - level0:rpm:gstlal
+    - level1:rpm:gstlal-ugly
+    - level2:rpm:gstlal-burst
+  only:
+    - /gstlal-burst-[0-9]+\.[0-9]+\.[0-9]+-v[0-9]+/
+
+docker:release:gstlal-calibration:el7:
+  <<: *docker-rpm
+  needs:
+    - level0:rpm:gstlal
+    - level1:rpm:gstlal-ugly
+    - level2:rpm:gstlal-calibration
+  only:
+    - /gstlal-calibration-[0-9]+\.[0-9]+\.[0-9]+-v[0-9]+/
+
 .docker:conda: &docker-conda
   interruptible: true
   stage: docker
@@ -223,81 +268,6 @@ docker:conda:prod:
   needs:
     - dependencies/conda-prod
 
-docker:release:gstlal-inspiral:el7:
-  interruptible: true
-  stage: docker
-  before_script: [ ]
-  script:
-    # add RPMs to directory to pass to docker
-    - mkdir rpms
-
-    # Copy rpms to new container.
-    - mv rpmbuild/RPMS/x86_64/*.rpm rpms
-
-    # Clear out the old rpmbuild directory
-    - rm -rf rpmbuild*
-
-    # Build the container:
-    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
-    - docker build --pull -t $DOCKER_BRANCH --file .gitlab-ci.Dockerfile.e7 .
-    - docker push $DOCKER_BRANCH
-  needs:
-    - level0:rpm:gstlal
-    - level1:rpm:gstlal-ugly
-    - level2:rpm:gstlal-inspiral
-  only:
-    - /gstlal-inspiral-[0-9]+\.[0-9]+\.[0-9]+-v[0-9]+/
-
-docker:release:gstlal-burst:el7:
-  interruptible: true
-  stage: docker
-  before_script: [ ]
-  script:
-    # add RPMs to directory to pass to docker
-    - mkdir rpms
-
-    # Copy rpms to new container.
-    - mv rpmbuild/RPMS/x86_64/*.rpm rpms
-
-    # Clear out the old rpmbuild directory
-    - rm -rf rpmbuild*
-
-    # Build the container:
-    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
-    - docker build --pull -t $DOCKER_BRANCH --file .gitlab-ci.Dockerfile.e7 .
-    - docker push $DOCKER_BRANCH
-  needs:
-    - level0:rpm:gstlal
-    - level1:rpm:gstlal-ugly
-    - level2:rpm:gstlal-burst
-  only:
-    - /gstlal-burst-[0-9]+\.[0-9]+\.[0-9]+-v[0-9]+/
-
-docker:release:gstlal-calibration:el7:
-  interruptible: true
-  stage: docker
-  before_script: [ ]
-  script:
-    # add RPMs to directory to pass to docker
-    - mkdir rpms
-
-    # Copy rpms to new container.
-    - mv rpmbuild/RPMS/x86_64/*.rpm rpms
-
-    # Clear out the old rpmbuild directory
-    - rm -rf rpmbuild*
-
-    # Build the container:
-    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
-    - docker build --pull -t $DOCKER_BRANCH --file .gitlab-ci.Dockerfile.e7 .
-    - docker push $DOCKER_BRANCH
-  needs:
-    - level0:rpm:gstlal
-    - level1:rpm:gstlal-ugly
-    - level2:rpm:gstlal-calibration
-  only:
-    - /gstlal-calibration-[0-9]+\.[0-9]+\.[0-9]+-v[0-9]+/
-
 latest_image:
   interruptible: true
   stage: docker-latest