diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5173212d3986934286400c740ab253a999cac6e8..f61d38518aa2092d01a970baa029b9ad60937179 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -43,6 +43,17 @@ build:dev-el6-gcc44: NAME: "python-${PYTHON_VERSION}-${OS}-${ARCH}" PYTHON_ROOT: "${CI_PROJECT_DIR}/${NAME}" +test:dev-el6-gcc44: + extends: [".test-python"] + image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44 + variables: + OS: "linux-el6" + ARCH: "x86_64" + NAME: "python-${PYTHON_VERSION}-${OS}-${ARCH}" + PYTHON_ROOT: "${CI_PROJECT_DIR}/${NAME}" + needs: + - build:dev-el6-gcc44 + build:dev-el6-gcc44-x86: extends: [".build-python"] image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44-x86 @@ -52,24 +63,53 @@ build:dev-el6-gcc44-x86: NAME: "python-${PYTHON_VERSION}-${OS}-${ARCH}" PYTHON_ROOT: "${CI_PROJECT_DIR}/${NAME}" -test:dev-el6-gcc44: +test:dev-el6-gcc44-x86: extends: [".test-python"] - image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44 + image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44-x86 variables: OS: "linux-el6" + ARCH: "i686" + NAME: "python-${PYTHON_VERSION}-${OS}-${ARCH}" + PYTHON_ROOT: "${CI_PROJECT_DIR}/${NAME}" + needs: + - build:dev-el6-gcc44-x86 + +build:dev-el7-gcc48: + extends: [".build-python"] + image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48 + variables: + OS: "linux-el7" + ARCH: "x86_64" + NAME: "python-${PYTHON_VERSION}-${OS}-${ARCH}" + PYTHON_ROOT: "${CI_PROJECT_DIR}/${NAME}" + +test:dev-el7-gcc48: + extends: [".test-python"] + image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48 + variables: + OS: "linux-el7" ARCH: "x86_64" NAME: "python-${PYTHON_VERSION}-${OS}-${ARCH}" PYTHON_ROOT: "${CI_PROJECT_DIR}/${NAME}" needs: - - build:dev-el6-gcc44 + - build:dev-el7-gcc48 -test:dev-el6-gcc44-x86: +build:dev-el7-gcc48-x86: + extends: [".build-python"] + image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48-x86 + variables: + OS: "linux-el7" + ARCH: "i686" + NAME: "python-${PYTHON_VERSION}-${OS}-${ARCH}" + PYTHON_ROOT: "${CI_PROJECT_DIR}/${NAME}" + +test:dev-el7-gcc48-x86: extends: [".test-python"] - image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44-x86 + image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48-x86 variables: - OS: "linux-el6" + OS: "linux-el7" ARCH: "i686" NAME: "python-${PYTHON_VERSION}-${OS}-${ARCH}" PYTHON_ROOT: "${CI_PROJECT_DIR}/${NAME}" needs: - - build:dev-el6-gcc44-x86 + - build:dev-el7-gcc48-x86 \ No newline at end of file