Reintegrate all build after succesful fix of dependencies management

.gitlab/conan-el6-gcc44-x86.gitlab-ci.yml

@@ -11,7 +11,7 @@ stages:
     - build
     - test
     - release
-    - deploy
+    - triggers
 
 before_script:
     - echo "${CI_REGISTRY_PASSWORD}" | docker login -u ${CI_REGISTRY_USER} --password-stdin ${CI_REGISTRY}
@@ -40,27 +40,20 @@ release:
         - docker tag ${CONTAINER_TEST_IMAGE} ${CONTAINER_RELEASE_IMAGE}
         - docker push ${CONTAINER_RELEASE_IMAGE}
 
-child-pipeline:
-  stage: test
-  trigger:
-    include: child.yml
-    strategy: depend
-
-
 conan-el6-gcc73-x86:
-  stage: deploy
+  stage: triggers
   trigger:
     include: .gitlab/conan-el6-gcc73-x86.gitlab-ci.yml
     strategy: depend
 
 conan-el6-gcc83-x86:
-  stage: deploy
+  stage: triggers
   trigger:
     include: .gitlab/conan-el6-gcc83-x86.gitlab-ci.yml
     strategy: depend
 
 conan-el6-gcc91-x86:
-  stage: deploy
+  stage: triggers
   trigger:
     include: .gitlab/conan-el6-gcc91-x86.gitlab-ci.yml
     strategy: depend

.gitlab/conan-el6-gcc44.gitlab-ci.yml

@@ -11,7 +11,7 @@ stages:
     - build
     - test
     - release
-    - deploy
+    - triggers
 
 before_script:
     - echo "${CI_REGISTRY_PASSWORD}" | docker login -u ${CI_REGISTRY_USER} --password-stdin ${CI_REGISTRY}
@@ -44,19 +44,19 @@ release:
         paths: [artifact.txt]
 
 conan-el6-gcc73:
-  stage: deploy
+  stage: triggers
   trigger:
     include: .gitlab/conan-el6-gcc73.gitlab-ci.yml
     strategy: depend
 
 conan-el6-gcc83:
-  stage: deploy
+  stage: triggers
   trigger:
     include: .gitlab/conan-el6-gcc83.gitlab-ci.yml
     strategy: depend
 
 conan-el6-gcc91:
-  stage: deploy
+  stage: triggers
   trigger:
     include: .gitlab/conan-el6-gcc91.gitlab-ci.yml
     strategy: depend

.gitlab/conan-el7-gcc48-x86.gitlab-ci.yml

@@ -11,7 +11,7 @@ stages:
     - build
     - test
     - release
-    - deploy
+    - triggers
 
 before_script:
     - echo "${CI_REGISTRY_PASSWORD}" | docker login -u ${CI_REGISTRY_USER} --password-stdin ${CI_REGISTRY}
@@ -41,19 +41,19 @@ release:
         - docker push ${CONTAINER_RELEASE_IMAGE}
 
 conan-el7-gcc73-x86:
-  stage: deploy
+  stage: triggers
   trigger:
     include: .gitlab/conan-el7-gcc73-x86.gitlab-ci.yml
     strategy: depend
     
 conan-el7-gcc83-x86:
-  stage: deploy
+  stage: triggers
   trigger:
     include: .gitlab/conan-el7-gcc83-x86.gitlab-ci.yml
     strategy: depend
 
 conan-el7-gcc93-x86:
-  stage: deploy
+  stage: triggers
   trigger:
     include: .gitlab/conan-el7-gcc93-x86.gitlab-ci.yml
     strategy: depend

.gitlab/conan-el7-gcc48.gitlab-ci.yml

@@ -11,7 +11,7 @@ stages:
     - build
     - test
     - release
-    - deploy
+    - triggers
 
 before_script:
     - echo "${CI_REGISTRY_PASSWORD}" | docker login -u ${CI_REGISTRY_USER} --password-stdin ${CI_REGISTRY}
@@ -41,19 +41,19 @@ release:
         - docker push ${CONTAINER_RELEASE_IMAGE}
 
 conan-el7-gcc73:
-  stage: deploy
+  stage: triggers
   trigger:
     include: .gitlab/conan-el7-gcc73.gitlab-ci.yml
     strategy: depend
 
 conan-el7-gcc83:
-  stage: deploy
+  stage: triggers
   trigger:
     include: .gitlab/conan-el7-gcc83.gitlab-ci.yml
     strategy: depend
 
 conan-el7-gcc93:
-  stage: deploy
+  stage: triggers
   trigger:
     include: .gitlab/conan-el7-gcc93.gitlab-ci.yml
     strategy: depend

.gitlab/main.gitlab-ci.yml

-include: .gitlab/conan-el6-gcc44.gitlab-ci.yml
-
-# stages:
-#   - triggers
+stages:
+  - triggers
 
-# conan-el6-gcc44:
-#   stage: triggers
-#   trigger: 
-#     include: .gitlab/conan-el6-gcc44.gitlab-ci.yml
-#     strategy: depend
-#   # rules:
-#   #   - changes:
-#   #     - conan-el6-gcc44/Dockerfile
+conan-el6-gcc44:
+  stage: triggers
+  trigger: 
+    include: .gitlab/conan-el6-gcc44.gitlab-ci.yml
+    strategy: depend
+  # rules:
+  #   - changes:
+  #     - conan-el6-gcc44/Dockerfile
 
-# conan-el6-gcc44-x86:
-#   stage: triggers
-#   trigger: 
-#     include: .gitlab/conan-el6-gcc44-x86.gitlab-ci.yml
-#     strategy: depend
-#   # rules:
-#   #   - changes:
-#   #     - conan-el6-gcc44-x86/Dockerfile
+conan-el6-gcc44-x86:
+  stage: triggers
+  trigger: 
+    include: .gitlab/conan-el6-gcc44-x86.gitlab-ci.yml
+    strategy: depend
+  # rules:
+  #   - changes:
+  #     - conan-el6-gcc44-x86/Dockerfile
 
-# conan-el7-gcc48:
-#   stage: triggers
-#   trigger: 
-#     include: .gitlab/conan-el7-gcc48.gitlab-ci.yml
-#     strategy: depend
-#   # rules:
-#   #   - changes:
-#   #     - conan-el7-gcc48/Dockerfile    
+conan-el7-gcc48:
+  stage: triggers
+  trigger: 
+    include: .gitlab/conan-el7-gcc48.gitlab-ci.yml
+    strategy: depend
+  # rules:
+  #   - changes:
+  #     - conan-el7-gcc48/Dockerfile    
 
-# conan-el7-gcc48-x86:
-#   stage: triggers
-#   trigger: 
-#     include: .gitlab/conan-el7-gcc48-x86.gitlab-ci.yml
-#     strategy: depend
-#   # rules:
-#   #   - changes:
-#   #     - conan-el7-gcc48-x86/Dockerfile
+conan-el7-gcc48-x86:
+  stage: triggers
+  trigger: 
+    include: .gitlab/conan-el7-gcc48-x86.gitlab-ci.yml
+    strategy: depend
+  # rules:
+  #   - changes:
+  #     - conan-el7-gcc48-x86/Dockerfile
\ No newline at end of file