Fix package build and supported package list.

Accelize · Jul 21, 2022 · 3722fe8 · 3722fe8
1 parent f0db3c6
commit 3722fe8
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 5 deletions.
diff --git a/deployment/Dockerfile.j2 b/deployment/Dockerfile.j2
@@ -8,7 +8,7 @@ ENV TOX_PARALLEL_NO_SPINNER 1
 
 # "Building" and "Testing" common layer
 RUN \
-{%- if osName == "rhel" %}
+{%- if osName == "rhel" and osVersion in ("7", "8") %}
 subscription-manager register \
     --auto-attach \
     --name=AccelizeDrmTestRhel{{ osVersion }} \
@@ -21,7 +21,6 @@ yum install -y \
     yum-plugin-fastestmirror && \
 yum install -y \
 {%- elif osName in ("fedora", "centos", "rhel") %}
-echo "fastestmirror=True" >> /etc/dnf/dnf.conf && \
 echo "max_parallel_downloads=10" >> /etc/dnf/dnf.conf && \
 echo "install_weak_deps=False" >> /etc/dnf/dnf.conf && \
 {%- if osName in ("centos", "rhel") %}
@@ -35,9 +34,12 @@ echo "APT::Acquire::Queue-Mode "access";" >> /etc/apt/apt.conf.d/parallel && \
 echo "APT::Acquire::Retries 10;" >> /etc/apt/apt.conf.d/parallel && \
 apt-get update && \
 apt-get install -y \
+{%- endif %}
+{%- if osName in ("debian", "ubuntu") and osVersion not in ("10", "18.04") %}
+    python-is-python3 \
 {%- endif %}
     python3-pip && \
-{%- if osName == "rhel" %}
+{%- if osName == "rhel" and osVersion in ("7", "8") %}
 subscription-manager remove --all && \
 subscription-manager unregister && \
 subscription-manager clean && \
@@ -62,7 +64,7 @@ python3 -m pip install -U{% if osName in ("centos", "rhel") and osVersion == "7"
 {%- if buildLayer %}
 # "Building" only layer
 RUN \
-{%- if osName == "rhel" %}
+{%- if osName == "rhel" and osVersion in ("7", "8") %}
 subscription-manager register \
     --auto-attach \
     --name=AccelizeDrmTestRhel{{ osVersion }} \
@@ -93,7 +95,7 @@ apt-get install -y \
     python3-devel \
     rpm-build && \
 {%- endif %}
-{%- if osName == "rhel" %}
+{%- if osName == "rhel" and osVersion in ("7", "8") %}
 subscription-manager remove --all && \
 subscription-manager unregister && \
 subscription-manager clean && \

diff --git a/deployment/azure-pipelines.yml b/deployment/azure-pipelines.yml
@@ -44,6 +44,7 @@ variables:
 stages:
   - stage: compile_and_test
     displayName: Compile sources and test multiple hardware designs
+    condition: not(startsWith(variables['Build.SourceBranch'], 'refs/tags'))
     variables:
       # Set Git branch conditional variables
       ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/master') }}:
@@ -131,6 +132,9 @@ stages:
 
                 # Publish packages
 
+                - script: find .. -name "*.rpm" -type f -exec mv {} . \; && find .. -name "*.deb" -type f -exec mv {} . \;
+                  displayName: Retrieve *.rpm and *.deb in working directory
+
                 - task: AWSCLI@1
                   displayName: Publish packages
                   inputs:

diff --git a/deployment/buildPackages.yml b/deployment/buildPackages.yml
@@ -14,6 +14,10 @@ jobs:
           osName: centos
           osVersion: "8"
           image: quay.io/centos/centos:stream8
+        CentOS 9 Stream:
+          osName: centos
+          osVersion: "9"
+          image: quay.io/centos/centos:stream9
         Debian 10:
           osName: debian
           osVersion: "10"

diff --git a/doc/drm_library_installation.rst b/doc/drm_library_installation.rst
@@ -19,13 +19,16 @@ tests:
 Following OS are minimally tested only (without hardware):
 
 * CentOS Stream 8
+* CentOS Stream 9
 * Debian 10 Buster
 * Debian 11 Bullseye
 * Fedora (2 latest stable versions)
 * Ubuntu 20.04 LTS Focal
+* Ubuntu 22.04 LTS Jammy
 * Ubuntu (2 latest stable versions)
 * Red Hat Enterprise Linux 7
 * Red Hat Enterprise Linux 8
+* Red Hat Enterprise Linux 9
 
 .. note:: We limit hardware tested OS to those which are supported by FPGA
           vendors. But, we do minimal tests on more OS to ensure to our