Add other platforms

.gitlab-ci.yml

@@ -43,7 +43,7 @@ stages:
   script:
     - cd ${CI_PROJECT_DIR}/${CONAN_ROOT}
     - zip -r --symlinks ../${CONAN_ROOT}.zip *
-    - 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file ../${CONAN_ROOT}.zip "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/conan/${CONAN_VERSION}/"'
+    - 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file ../${CONAN_ROOT}.zip "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/conan/${CONAN_VERSION}/${CONAN_ROOT}"'
 
 linux-el6-x86_64:
   extends: [".build"]
@@ -60,7 +60,6 @@ test-el6-x86_64:
     PLATFORM: "linux-el6-x86_64"
     CONAN_ROOT: "conan-${CONAN_VERSION}-${PLATFORM}"
     PYTHON_ROOT: "python-${PYTHON_VERSION}-${PLATFORM}"
-
   needs:
     - linux-el6-x86_64
 
@@ -69,85 +68,94 @@ package-el6-x86_64:
   image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44
   variables:
     PLATFORM: "linux-el6-x86_64"
-    NAME: "conan-${CONAN_VERSION}-${PLATFORM}"
+    CONAN_ROOT: "conan-${CONAN_VERSION}-${PLATFORM}"
   needs:
     - linux-el6-x86_64
     - test-el6-x86_64
 
-# linux-el6-i686:
-#   extends: [".build"]
-#   image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44-x86
-#   variables:
-#     PLATFORM: "linux-el6-i686"
-#     NAME: "conan-${GIT_VERSION}-${PLATFORM}"
-
-# test-el6-i686:
-#   extends: [".test"]
-#   image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44-x86
-#   variables:
-#     PLATFORM: "linux-el6-i686"
-#     NAME: "conan-${GIT_VERSION}-${PLATFORM}"
-#   needs:
-#     - linux-el6-i686
-
-# package-el6-i686:
-#   extends: [".package"]
-#   image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44-x86
-#   variables:
-#     PLATFORM: "linux-el6-i686"
-#     NAME: "conan-${GIT_VERSION}-${PLATFORM}"
-#   needs:
-#     - linux-el6-i686
-#     - test-el6-i686
-
-# linux-el7-x86_64:
-#   extends: [".build"]
-#   image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48
-#   variables:
-#     PLATFORM: "linux-el6-i686"
-#     NAME: "conan-${GIT_VERSION}-${PLATFORM}"
-
-# test-el7-x86_64:
-#   extends: [".test"]
-#   image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48
-#   variables:
-#     PLATFORM: "linux-el6-i686"
-#     NAME: "conan-${GIT_VERSION}-${PLATFORM}"
-#   needs:
-#     - linux-el7-x86_64
-
-# package-el7-x86_64:
-#   extends: [".package"]
-#   image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44-x86
-#   variables:
-#     PLATFORM: "linux-el6-i686"
-#     NAME: "conan-${GIT_VERSION}-${PLATFORM}"
-#   needs:
-#     - linux-el7-x86_64
-#     - test-el7-x86_64
-
-# linux-el7-i686:
-#   extends: [".build"]
-#   image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48-x86
-#   variables:
-#     PLATFORM: "linux-el6-i686"
-#     NAME: "conan-${GIT_VERSION}-${PLATFORM}"
-
-# test-el7-i686:
-#   extends: [".test"]
-#   image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48-x86
-#   variables:
-#     PLATFORM: "linux-el6-i686"
-#     NAME: "conan-${GIT_VERSION}-${PLATFORM}"
-#   needs:
-#     - linux-el7-i686
-
-# package-el7-i686:
-#   extends: [".package"]
-#   image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48-x86
-#   variables:
-#     PLATFORM: "linux-el6-i686"
-#     NAME: "conan-${GIT_VERSION}-${PLATFORM}"
-#   needs:
-#     - linux-el7-i686
-#     - test-el7-i686
\ No newline at end of file
+linux-el6-i686:
+  extends: [".build"]
+  image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44-x86
+  variables:
+    PLATFORM: "linux-el6-i686"
+    CONAN_ROOT: "conan-${CONAN_VERSION}-${PLATFORM}"
+    PYTHON_ROOT: "python-${PYTHON_VERSION}-${PLATFORM}"
+
+test-el6-i686:
+  extends: [".test"]
+  image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44-x86
+  variables:
+    PLATFORM: "linux-el6-i686"
+    CONAN_ROOT: "conan-${CONAN_VERSION}-${PLATFORM}"
+    PYTHON_ROOT: "python-${PYTHON_VERSION}-${PLATFORM}"
+  needs:
+    - linux-el6-i686
+
+package-el6-i686:
+  extends: [".package"]
+  image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44-x86
+  variables:
+    PLATFORM: "linux-el6-i686"
+    CONAN_ROOT: "conan-${CONAN_VERSION}-${PLATFORM}"
+    PYTHON_ROOT: "python-${PYTHON_VERSION}-${PLATFORM}"
+  needs:
+    - linux-el6-i686
+    - test-el6-i686
+
+linux-el7-x86_64:
+  extends: [".build"]
+  image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48
+  variables:
+    PLATFORM: "linux-el7-x86_64"
+    CONAN_ROOT: "conan-${CONAN_VERSION}-${PLATFORM}"
+    PYTHON_ROOT: "python-${PYTHON_VERSION}-${PLATFORM}"
+
+test-el7-x86_64:
+  extends: [".test"]
+  image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48
+  variables:
+    PLATFORM: "linux-el7-x86_64"
+    CONAN_ROOT: "conan-${CONAN_VERSION}-${PLATFORM}"
+    PYTHON_ROOT: "python-${PYTHON_VERSION}-${PLATFORM}"
+  needs:
+    - linux-el7-x86_64
+
+package-el7-x86_64:
+  extends: [".package"]
+  image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44-x86
+  variables:
+    PLATFORM: "linux-el7-x86_64"
+    CONAN_ROOT: "conan-${CONAN_VERSION}-${PLATFORM}"
+    PYTHON_ROOT: "python-${PYTHON_VERSION}-${PLATFORM}"
+  needs:
+    - linux-el7-x86_64
+    - test-el7-x86_64
+
+linux-el7-i686:
+  extends: [".build"]
+  image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48-x86
+  variables:
+    PLATFORM: "linux-el7-i686"
+    CONAN_ROOT: "conan-${CONAN_VERSION}-${PLATFORM}"
+    PYTHON_ROOT: "python-${PYTHON_VERSION}-${PLATFORM}"
+
+test-el7-i686:
+  extends: [".test"]
+  image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48-x86
+  variables:
+    PLATFORM: "linux-el7-i686"
+    CONAN_ROOT: "conan-${CONAN_VERSION}-${PLATFORM}"
+    PYTHON_ROOT: "python-${PYTHON_VERSION}-${PLATFORM}"
+  needs:
+    - linux-el7-i686
+
+package-el7-i686:
+  extends: [".package"]
+  image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48-x86
+  variables:
+    PLATFORM: "linux-el7-i686"
+    CONAN_ROOT: "conan-${CONAN_VERSION}-${PLATFORM}"
+    PYTHON_ROOT: "python-${PYTHON_VERSION}-${PLATFORM}"
+  needs:
+    - linux-el7-i686
+    - test-el7-i686
\ No newline at end of file