Combine jobs for proper gitlab job grouping

.gitlab-ci.yml

@@ -11,19 +11,6 @@ stages:
   - deploy
 
 
-#
-# Cleaning
-#
-.do-nightly-clean: &do-nightly-clean
-  stage: clean
-  script:
-    - ./cicd_testing/do-clean.sh 
-
-do-nightly-clean-ubuntu18:
-  <<: *do-nightly-clean
-  tags:
-    - ubuntu18
-
 
 
 #
@@ -33,27 +20,15 @@ do-nightly-clean-ubuntu18:
 .do-build: &do-build
   stage: build
   script:
+    - ./cicd_testing/do-clean.sh 
     - ./cicd_testing/do-build.sh 
+    - ./cicd_testing/do-test.sh 
 
 do-build-ubuntu18:
   <<: *do-build
   tags:
     - ubuntu18
 
-#
-# testing
-#
-
-.do-test: &do-test
-  stage: test
-  script:
-    - ./cicd_testing/do-test.sh 
-
-do-test-ubuntu18:
-  <<: *do-test
-  tags:
-    - ubuntu18
-
 #
 # testing docker container, plus weekly deployment
 #