Add tools jq and yq

11b0de6a · Patrick MADELA · c60b49d1 · 11b0de6a · 11b0de6a · 11b0de6a
Commit 11b0de6a authored Jul 12, 2023 by Patrick MADELA
--- a/conan-el6-gcc44-x86/.gitlab-ci.yml
+++ b/conan-el6-gcc44-x86/.gitlab-ci.yml
@@ -32,6 +32,8 @@ test:
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.4"
+        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version
+        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version

 release:
    stage: release

--- a/conan-el6-gcc44-x86/Dockerfile
+++ b/conan-el6-gcc44-x86/Dockerfile
@@ -14,7 +14,7 @@ ENV PYTHON_ROOT=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH} \
    CONAN_ROOT=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH} \
    CMAKE_ROOT=${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH} \
    GIT_ROOT=${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH} \
-    PATH=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \
+    PATH=${DEVTOOLS_ROOT}/bin:${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \
    LD_LIBRARY_PATH=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/lib \
    CXX=/usr/bin/g++ \
    CC=/usr/bin/gcc
@@ -45,6 +45,11 @@ RUN groupadd 1001 -g 1001 \
    && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.4/download?job=linux-i686 \
    && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
    && rm ${CONAN_ROOT}.zip \
+    # Install other tools
+    && mkdir ${DEVTOOLS_ROOT}/bin \
+    && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.6/jq-linux32 \
+    && curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_386 \
+    && chmod +x ${DEVTOOLS_ROOT}/bin/* \
    # Force to use linux32 when Jenkins uses docker exec ... sh -c "..."
    && rm /bin/sh \
    && echo -e '#!/bin/bash\n/usr/bin/linux32 -- /bin/bash "$@"' > /bin/sh \

--- a/conan-el6-gcc44/.gitlab-ci.yml
+++ b/conan-el6-gcc44/.gitlab-ci.yml
@@ -32,6 +32,8 @@ test:
        - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
        - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
        - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.4"
+        - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version
+        - docker run --rm ${CONTAINER_TEST_IMAGE} yq --version

 release:
    stage: release

--- a/conan-el6-gcc44/Dockerfile
+++ b/conan-el6-gcc44/Dockerfile
@@ -14,7 +14,7 @@ ENV PYTHON_ROOT=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH} \
    CONAN_ROOT=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH} \
    CMAKE_ROOT=${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH} \
    GIT_ROOT=${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH} \
-    PATH=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \
+    PATH=${DEVTOOLS_ROOT}/bin:${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \
    LD_LIBRARY_PATH=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/lib \
    CXX=/usr/bin/g++ \
    CC=/usr/bin/gcc
@@ -47,7 +47,12 @@ RUN groupadd 1001 -g 1001 \
    # Install conan
    && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.4/download?job=linux-x86_64 \
    && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
-    && rm ${CONAN_ROOT}.zip
+    && rm ${CONAN_ROOT}.zip \
+    # Install other tools
+    && mkdir ${DEVTOOLS_ROOT}/bin \
+    && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.6/jq-linux64 \
+    && curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_amd64 \
+    && chmod +x ${DEVTOOLS_ROOT}/bin/*

 USER conan
 WORKDIR /home/conan

--- a/conan-el6-gcc73-x86/.gitlab-ci.yml
+++ b/conan-el6-gcc73-x86/.gitlab-ci.yml
@@ -31,6 +31,8 @@ test:
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.4"
+        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version
+        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version

 release:
    stage: release

--- a/conan-el6-gcc73-x86/Dockerfile
+++ b/conan-el6-gcc73-x86/Dockerfile
@@ -14,7 +14,7 @@ ENV PYTHON_ROOT=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH} \
    CONAN_ROOT=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH} \
    CMAKE_ROOT=${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH} \
    GIT_ROOT=${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH} \
-    PATH=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \
+    PATH=${DEVTOOLS_ROOT}/bin:${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \
    LD_LIBRARY_PATH=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/lib \
    CXX=/opt/rh/devtoolset-7/root/usr/bin/g++ \
    CC=/opt/rh/devtoolset-7/root/usr/bin/gcc
@@ -45,6 +45,11 @@ RUN groupadd 1001 -g 1001 \
    && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.4/download?job=linux-i686 \
    && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
    && rm ${CONAN_ROOT}.zip \
+    # Install other tools
+    && mkdir ${DEVTOOLS_ROOT}/bin \
+    && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.6/jq-linux32 \
+    && curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_386 \
+    && chmod +x ${DEVTOOLS_ROOT}/bin/* \
    # Force to use linux32 when Jenkins uses docker exec ... sh -c "..."
    && rm /bin/sh \
    && echo -e '#!/bin/bash\n/usr/bin/linux32 -- /bin/bash "$@"' > /bin/sh \

--- a/conan-el6-gcc73/.gitlab-ci.yml
+++ b/conan-el6-gcc73/.gitlab-ci.yml
@@ -31,6 +31,8 @@ test:
        - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
        - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
        - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.4"
+        - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version
+        - docker run --rm ${CONTAINER_TEST_IMAGE} yq --version

 release:
    stage: release

--- a/conan-el6-gcc73/Dockerfile
+++ b/conan-el6-gcc73/Dockerfile
@@ -14,7 +14,7 @@ ENV PYTHON_ROOT=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH} \
    CONAN_ROOT=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH} \
    CMAKE_ROOT=${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH} \
    GIT_ROOT=${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH} \
-    PATH=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \
+    PATH=${DEVTOOLS_ROOT}/bin:${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \
    LD_LIBRARY_PATH=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/lib \
    CXX=/opt/rh/devtoolset-7/root/usr/bin/g++ \
    CC=/opt/rh/devtoolset-7/root/usr/bin/gcc
@@ -47,7 +47,12 @@ RUN groupadd 1001 -g 1001 \
    # Install conan
    && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.4/download?job=linux-x86_64 \
    && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
-    && rm ${CONAN_ROOT}.zip
+    && rm ${CONAN_ROOT}.zip \
+    # Install other tools
+    && mkdir ${DEVTOOLS_ROOT}/bin \
+    && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.6/jq-linux64 \
+    && curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_amd64 \
+    && chmod +x ${DEVTOOLS_ROOT}/bin/*

 USER conan
 WORKDIR /home/conan

--- a/conan-el6-gcc83-x86/.gitlab-ci.yml
+++ b/conan-el6-gcc83-x86/.gitlab-ci.yml
@@ -31,6 +31,8 @@ test:
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.4"
+        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version
+        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version

 release:
    stage: release

--- a/conan-el6-gcc83-x86/Dockerfile
+++ b/conan-el6-gcc83-x86/Dockerfile
@@ -14,7 +14,7 @@ ENV PYTHON_ROOT=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH} \
    CONAN_ROOT=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH} \
    CMAKE_ROOT=${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH} \
    GIT_ROOT=${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH} \
-    PATH=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \
+    PATH=${DEVTOOLS_ROOT}/bin:${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \
    LD_LIBRARY_PATH=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/lib \
    CXX=/opt/rh/devtoolset-8/root/usr/bin/g++ \
    CC=/opt/rh/devtoolset-8/root/usr/bin/gcc
@@ -45,6 +45,11 @@ RUN groupadd 1001 -g 1001 \
    && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.4/download?job=linux-i686 \
    && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
    && rm ${CONAN_ROOT}.zip \
+    # Install other tools
+    && mkdir ${DEVTOOLS_ROOT}/bin \
+    && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.6/jq-linux32 \
+    && curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_386 \
+    && chmod +x ${DEVTOOLS_ROOT}/bin/* \
    # Force to use linux32 when Jenkins uses docker exec ... sh -c "..."
    && rm /bin/sh \
    && echo -e '#!/bin/bash\n/usr/bin/linux32 -- /bin/bash "$@"' > /bin/sh \

--- a/conan-el6-gcc83/.gitlab-ci.yml
+++ b/conan-el6-gcc83/.gitlab-ci.yml
@@ -31,6 +31,8 @@ test:
        - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
        - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
        - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.4"
+        - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version
+        - docker run --rm ${CONTAINER_TEST_IMAGE} yq --version

 release:
    stage: release

--- a/conan-el6-gcc83/Dockerfile
+++ b/conan-el6-gcc83/Dockerfile
@@ -14,7 +14,7 @@ ENV PYTHON_ROOT=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH} \
    CONAN_ROOT=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH} \
    CMAKE_ROOT=${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH} \
    GIT_ROOT=${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH} \
-    PATH=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \
+    PATH=${DEVTOOLS_ROOT}/bin:${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \
    LD_LIBRARY_PATH=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/lib \
    CXX=/opt/rh/devtoolset-8/root/usr/bin/g++ \
    CC=/opt/rh/devtoolset-8/root/usr/bin/gcc
@@ -47,7 +47,12 @@ RUN groupadd 1001 -g 1001 \
    # Install conan
    && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.4/download?job=linux-x86_64 \
    && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
-    && rm ${CONAN_ROOT}.zip
+    && rm ${CONAN_ROOT}.zip \
+    # Install other tools
+    && mkdir ${DEVTOOLS_ROOT}/bin \
+    && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.6/jq-linux64 \
+    && curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_amd64 \
+    && chmod +x ${DEVTOOLS_ROOT}/bin/*

 USER conan
 WORKDIR /home/conan

--- a/conan-el6-gcc91-x86/.gitlab-ci.yml
+++ b/conan-el6-gcc91-x86/.gitlab-ci.yml
@@ -31,6 +31,8 @@ test:
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.4"
+        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version
+        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version

 release:
    stage: release

--- a/conan-el6-gcc91-x86/Dockerfile
+++ b/conan-el6-gcc91-x86/Dockerfile
@@ -14,7 +14,7 @@ ENV PYTHON_ROOT=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH} \
    CONAN_ROOT=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH} \
    CMAKE_ROOT=${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH} \
    GIT_ROOT=${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH} \
-    PATH=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \
+    PATH=${DEVTOOLS_ROOT}/bin:${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \
    LD_LIBRARY_PATH=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/lib \
    CXX=/opt/rh/devtoolset-9/root/usr/bin/g++ \
    CC=/opt/rh/devtoolset-9/root/usr/bin/gcc
@@ -45,6 +45,11 @@ RUN groupadd 1001 -g 1001 \
    && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.4/download?job=linux-i686 \
    && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
    && rm ${CONAN_ROOT}.zip \
+    # Install other tools
+    && mkdir ${DEVTOOLS_ROOT}/bin \
+    && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.6/jq-linux32 \
+    && curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_386 \
+    && chmod +x ${DEVTOOLS_ROOT}/bin/* \
    # Force to use linux32 when Jenkins uses docker exec ... sh -c "..."
    && rm /bin/sh \
    && echo -e '#!/bin/bash\n/usr/bin/linux32 -- /bin/bash "$@"' > /bin/sh \

--- a/conan-el6-gcc91/.gitlab-ci.yml
+++ b/conan-el6-gcc91/.gitlab-ci.yml
@@ -31,6 +31,8 @@ test:
        - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
        - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
        - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.4"
+        - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version
+        - docker run --rm ${CONTAINER_TEST_IMAGE} yq --version

 release:
    stage: release

--- a/conan-el6-gcc91/Dockerfile
+++ b/conan-el6-gcc91/Dockerfile
@@ -14,7 +14,7 @@ ENV PYTHON_ROOT=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH} \
    CONAN_ROOT=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH} \
    CMAKE_ROOT=${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH} \
    GIT_ROOT=${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH} \
-    PATH=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \
+    PATH=${DEVTOOLS_ROOT}/bin:${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \
    LD_LIBRARY_PATH=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/lib \
    CXX=/opt/rh/devtoolset-9/root/usr/bin/g++ \
    CC=/opt/rh/devtoolset-9/root/usr/bin/gcc
@@ -47,7 +47,12 @@ RUN groupadd 1001 -g 1001 \
    # Install conan
    && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.4/download?job=linux-x86_64 \
    && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
-    && rm ${CONAN_ROOT}.zip
+    && rm ${CONAN_ROOT}.zip \
+    # Install other tools
+    && mkdir ${DEVTOOLS_ROOT}/bin \
+    && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.6/jq-linux64 \
+    && curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_amd64 \
+    && chmod +x ${DEVTOOLS_ROOT}/bin/*

 USER conan
 WORKDIR /home/conan

--- a/conan-el7-gcc48-x86/.gitlab-ci.yml
+++ b/conan-el7-gcc48-x86/.gitlab-ci.yml
@@ -32,6 +32,8 @@ test:
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.4"
+        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version
+        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version

 release:
    stage: release

--- a/conan-el7-gcc48-x86/Dockerfile
+++ b/conan-el7-gcc48-x86/Dockerfile
@@ -14,7 +14,7 @@ ENV PYTHON_ROOT=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH} \
    CONAN_ROOT=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH} \
    CMAKE_ROOT=${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH} \
    GIT_ROOT=${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH} \
-    PATH=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \
+    PATH=${DEVTOOLS_ROOT}/bin:${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \
    LD_LIBRARY_PATH=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/lib \
    CXX=/usr/bin/g++ \
    CC=/usr/bin/gcc
@@ -45,6 +45,11 @@ RUN groupadd g1001 -g 1001 \
    && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.4/download?job=linux-i686 \
    && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
    && rm ${CONAN_ROOT}.zip \
+    # Install other tools
+    && mkdir ${DEVTOOLS_ROOT}/bin \
+    && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.6/jq-linux32 \
+    && curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_386 \
+    && chmod +x ${DEVTOOLS_ROOT}/bin/* \
    # Force to use linux32 when Jenkins uses docker exec ... sh -c "..."
    && rm /bin/sh \
    && echo -e '#!/bin/bash\n/usr/bin/linux32 -- /bin/bash "$@"' > /bin/sh \

--- a/conan-el7-gcc48/.gitlab-ci.yml
+++ b/conan-el7-gcc48/.gitlab-ci.yml
@@ -32,6 +32,8 @@ test:
        - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
        - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
        - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.4"
+        - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version
+        - docker run --rm ${CONTAINER_TEST_IMAGE} yq --version

 release:
    stage: release

--- a/conan-el7-gcc48/Dockerfile
+++ b/conan-el7-gcc48/Dockerfile
@@ -14,7 +14,7 @@ ENV PYTHON_ROOT=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH} \
    CONAN_ROOT=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH} \
    CMAKE_ROOT=${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH} \
    GIT_ROOT=${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH} \
-    PATH=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \
+    PATH=${DEVTOOLS_ROOT}/bin:${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \
    LD_LIBRARY_PATH=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/lib \
    CXX=/usr/bin/g++ \
    CC=/usr/bin/gcc
@@ -47,7 +47,12 @@ RUN groupadd g1001 -g 1001 \
    # Install conan
    && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.4/download?job=linux-x86_64 \
    && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
-    && rm ${CONAN_ROOT}.zip
+    && rm ${CONAN_ROOT}.zip \
+    # Install other tools
+    && mkdir ${DEVTOOLS_ROOT}/bin \
+    && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.6/jq-linux64 \
+    && curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_amd64 \
+    && chmod +x ${DEVTOOLS_ROOT}/bin/*

 USER conan
 WORKDIR /home/conan