Merge pull request #182 in ASAPO/asapo from feature_ASAPO-153-packages-for-debian-11 to develop

* commit 'a70f22c0':
  include debian11 to deployment, skip python2 packages there

CMakeLists.txt

@@ -22,6 +22,8 @@ set(ConfigPackageLocation lib/cmake/Asapo)
 # options
 
 option(BUILD_PYTHON "Build python libs" ON)
+option(BUILD_PYTHON2_PACKAGES "Build python2 packages" ON)
+
 option(BUILD_CLIENTS_ONLY "Build clients only" OFF)
 
 option(BUILD_CONSUMER_TOOLS "Build consumer tools" OFF)

consumer/api/python/dist_linux/CMakeLists.txt

@@ -9,30 +9,33 @@ if ("source" IN_LIST BUILD_PYTHON_PACKAGES )
 endif()
 
 if ("rpm" IN_LIST BUILD_PYTHON_PACKAGES)
-    ADD_CUSTOM_TARGET(python-rpm-consumer ALL
+    if (BUILD_PYTHON2_PACKAGES)
+        ADD_CUSTOM_TARGET(python-rpm-consumer ALL
             COMMAND PACKAGE_PREFIX=python- python setup.py bdist_rpm --release=1.${PACKAGE_RELEASE_SUFFIX}
             --requires=numpy --binary-only
             COMMAND rm -f dist/python*.gz dist/*debuginfo* dist/*debugsource*
             )
-
+        ADD_DEPENDENCIES(python-rpm-consumer python3-rpm-consumer)
+    endif()
     ADD_CUSTOM_TARGET(python3-rpm-consumer ALL
             COMMAND PACKAGE_PREFIX=python3- python3 setup.py bdist_rpm --release=1.${PACKAGE_RELEASE_SUFFIX}
             --requires=python3-numpy --binary-only
             COMMAND rm -f dist/python3*.gz dist/*debuginfo* dist/*debugsource*
             )
-    ADD_DEPENDENCIES(python3-rpm-consumer python-rpm-consumer)
-    ADD_DEPENDENCIES(python-rpm-consumer copy_python_dist-consumer)
+    ADD_DEPENDENCIES(python3-rpm-consumer copy_python_dist-consumer)
 endif()
 
 if ("deb" IN_LIST BUILD_PYTHON_PACKAGES)
-    ADD_CUSTOM_TARGET(python-deb-consumer ALL
+    if (BUILD_PYTHON2_PACKAGES)
+        ADD_CUSTOM_TARGET(python-deb-consumer ALL
             COMMAND rm -rf deb_dist/*/
             COMMAND PACKAGE_PREFIX= python setup.py --command-packages=stdeb.command
             sdist_dsc --debian-version=${PACKAGE_RELEASE_SUFFIX} --depends=python-numpy bdist_deb
             COMMAND rm -f deb_dist/*dbgsym*
             COMMAND cp deb_dist/*.deb dist/
             )
-
+        ADD_DEPENDENCIES(python-deb-consumer python3-deb-consumer)
+    endif()
     ADD_CUSTOM_TARGET(python3-deb-consumer ALL
             COMMAND rm -rf deb_dist/*/
             COMMAND PACKAGE_PREFIX= python3 setup.py --command-packages=stdeb.command
@@ -40,8 +43,7 @@ if ("deb" IN_LIST BUILD_PYTHON_PACKAGES)
             COMMAND rm -f deb_dist/*dbgsym*
             COMMAND cp deb_dist/*.deb dist/
             )
-    ADD_DEPENDENCIES(python3-deb-consumer python-deb-consumer)
-    ADD_DEPENDENCIES(python-deb-consumer copy_python_dist-consumer)
+    ADD_DEPENDENCIES(python3-deb-consumer copy_python_dist-consumer)
 endif()
 
 ADD_CUSTOM_TARGET(copy_python_dist-consumer ALL

deploy/build_env/debians/Dockerfile_debian11.1

+from debian:11.1
+
+ENV GOPATH /tmp
+
+ADD install_curl.sh install_curl.sh
+
+RUN apt update && apt install -y g++ git wget python3 python3-numpy python3-pip cmake \
+zlib1g-dev python3-all-dev python3-stdeb
+
+RUN pip3 --no-cache-dir install cython
+
+RUN ./install_curl.sh /curl
+
+ADD install_libfabric.sh install_libfabric.sh
+RUN ./install_libfabric.sh
+
+RUN apt install -y libcurl4-openssl-dev
+
+RUN apt install dh-python
+
+ARG OS
+ENV OS=${OS}
+ADD build.sh /bin/build.sh
\ No newline at end of file

deploy/build_env/debians/build.sh

@@ -25,6 +25,13 @@ else
   BUILD_PYTHON_DOCS=OFF
 fi
 
+if [ "$OS" = "debian11.1" ]; then
+  BUILD_PYTHON2_PACKAGES=OFF
+else
+  BUILD_PYTHON2_PACKAGES=ON
+fi
+
+
 #switch to static curl for Python packages
 rm CMakeCache.txt
 cmake \
@@ -35,6 +42,7 @@ cmake \
     -DNUMPY_VERSION=0   \
     -DBUILD_PYTHON=ON   \
     -DPACKAGE_RELEASE_SUFFIX=$OS \
+    -DBUILD_PYTHON2_PACKAGES=$BUILD_PYTHON2_PACKAGES \
     -DBUILD_PYTHON_PACKAGES="source;deb"   \
     -DBUILD_PYTHON_DOCS=$BUILD_PYTHON_DOCS \
     ..

deploy/build_env/debians/build_images.sh

 #!/usr/bin/env bash
 set -e
 
-vers="ubuntu18.04 ubuntu16.04 debian9.13 debian10.7"
+vers="ubuntu18.04 ubuntu16.04 debian9.13 debian10.7 debian11.1"
 
 for ver in $vers
 do

producer/api/python/dist_linux/CMakeLists.txt

@@ -4,30 +4,33 @@ configure_file(MANIFEST.in MANIFEST.in @ONLY)
 file(GENERATE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/setup.py INPUT ${CMAKE_CURRENT_BINARY_DIR}/setup.py)
 
 if ("rpm" IN_LIST BUILD_PYTHON_PACKAGES)
-	ADD_CUSTOM_TARGET(python-rpm-producer ALL
+	if (BUILD_PYTHON2_PACKAGES)
+		ADD_CUSTOM_TARGET(python-rpm-producer ALL
 		COMMAND PACKAGE_PREFIX=python- python setup.py bdist_rpm --release=1.${PACKAGE_RELEASE_SUFFIX}
 			--requires=numpy --binary-only
 			COMMAND rm -f dist/python*.gz dist/*debuginfo* dist/*debugsource*
 		)
-
+		ADD_DEPENDENCIES(python-rpm-producer python3-rpm-producer)
+	endif()
 	ADD_CUSTOM_TARGET(python3-rpm-producer ALL
 		COMMAND PACKAGE_PREFIX=python3- python3 setup.py bdist_rpm --release=1.${PACKAGE_RELEASE_SUFFIX}
 			--requires=python3-numpy --binary-only
 		COMMAND rm -f dist/python3*.gz dist/*debuginfo* dist/*debugsource*
 		)
-	ADD_DEPENDENCIES(python3-rpm-producer python-rpm-producer)
-	ADD_DEPENDENCIES(python-rpm-producer copy_python_dist-producer)
+	ADD_DEPENDENCIES(python3-rpm-producer copy_python_dist-producer)
 endif()
 
 if ("deb" IN_LIST BUILD_PYTHON_PACKAGES)
-	ADD_CUSTOM_TARGET(python-deb-producer ALL
+	if (BUILD_PYTHON2_PACKAGES)
+		ADD_CUSTOM_TARGET(python-deb-producer ALL
 			COMMAND rm -rf deb_dist/*/
 			COMMAND PACKAGE_PREFIX= python setup.py --command-packages=stdeb.command
 			sdist_dsc --debian-version=${PACKAGE_RELEASE_SUFFIX} --depends=python-numpy bdist_deb
 			COMMAND rm -f deb_dist/*dbgsym*
 			COMMAND cp deb_dist/*.deb dist/
 			)
-
+		ADD_DEPENDENCIES(python-deb-producer python3-deb-producer)
+	endif()
 	ADD_CUSTOM_TARGET(python3-deb-producer ALL
 			COMMAND rm -rf deb_dist/*/
 			COMMAND PACKAGE_PREFIX= python3 setup.py --command-packages=stdeb.command
@@ -35,8 +38,7 @@ if ("deb" IN_LIST BUILD_PYTHON_PACKAGES)
 			COMMAND rm -f deb_dist/*dbgsym*
 			COMMAND cp deb_dist/*.deb dist/
 			)
-	ADD_DEPENDENCIES(python3-deb-producer python-deb-producer)
-	ADD_DEPENDENCIES(python-deb-producer copy_python_dist-producer)
+	ADD_DEPENDENCIES(python3-deb-producer copy_python_dist-producer)
 endif()
 
 if ("source" IN_LIST BUILD_PYTHON_PACKAGES )