Realign on dev

Accelize · Oct 26, 2020 · a7d498f · a7d498f
2 parents a01c40a + 8c92472
commit a7d498f
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 18 deletions.
diff --git a/deployment/azure-pipelines.yml b/deployment/azure-pipelines.yml
@@ -113,18 +113,15 @@ stages:
             CentOS 8:
               osName: centos
               osVersion: "8"
-            Debian 9:
-              osName: debian
-              osVersion: "9"
             Debian 10:
               osName: debian
               osVersion: "10"
-            Fedora 31:
-              osName: fedora
-              osVersion: "31"
             Fedora 32:
               osName: fedora
               osVersion: "32"
+            Fedora 33:
+              osName: fedora
+              osVersion: "33"
             Ubuntu LTS 16.04:
               osName: ubuntu
               osVersion: "16.04"
@@ -134,9 +131,9 @@ stages:
             Ubuntu LTS 20.04:
               osName: ubuntu
               osVersion:  "20.04"
-            Ubuntu 19.10:
+            Ubuntu 20.10:
               osName: ubuntu
-              osVersion:  "19.10"
+              osVersion:  "20.10"
 
         variables:
           # Docker commands shortcuts

diff --git a/doc/drm_hardware_integration.rst b/doc/drm_hardware_integration.rst
@@ -275,10 +275,10 @@ in number of usage units for this particular account.
 Instantiate the adapted IP core and DRM Activator in the wrapper and connect them
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-* Instantiate the DRM Activator IP located in the DRM_HDK/v_l_n_v/rtk/syn.
+* Instantiate the DRM Activator IP located in the DRM_HDK/v_l_n_v/syn.
 * Connect the signals of the DRM Activator listed by the table in section `Adapt the IP core`_
   to the adapted IP core.
-* Connect the DRM bus of the DRM Activator listed by the table in seciton `Create a wrapper`_
+* Connect the DRM bus of the DRM Activator listed by the table in section `Create a wrapper`_
   to the wrapper interface.
 * Connect the clock and reset of the adapted IP core to the wrapper interface.
 

diff --git a/doc/drm_hardware_ip_activator.rst b/doc/drm_hardware_ip_activator.rst
@@ -172,10 +172,8 @@ IP Activator HDK directories and files:
    ----- constraints
    -------- constraints.sdc
    ----- drm_ip_activator_0xvvvvllllnnnnvvvv.vhdl
-   ----- drm_ip_activator_0xvvvvllllnnnnvvvv.v
    ----- drm_ip_activator_0xvvvvllllnnnnvvvv.vho
    ----- drm_ip_activator_0xvvvvllllnnnnvvvv.veo
-   ----- drm_ip_activator_0xvvvvllllnnnnvvvv.xml
    ----- drm_ip_activator_package_0xvvvvllllnnnnvvvv.vhdl
    -- sim/
    ----- modelsim/
@@ -211,11 +209,11 @@ IP Activator HDK directories and files:
    -------- drm_all_components.vhdl
 
 
-The IP Activator top-level file is drm_ip_activator_0xvvvvllllnnnnvvvv_axi4st.
-It declares an entity named **drm_ip_activator_0xVVVVLLLLNNNNVVVV_axi4st** where
+The IP Activator top-level file is ``top_drm_activator_0xvvvvllllnnnnvvvv.(v|vhdl)``.
+It declares an entity named **top_drm_activator_0xVVVVLLLLNNNNVVVV** where
 is a 64 bits hexadecimal encoding of the IP VLNV.
 
-For example **drm_ip_activator_0x0C001020A56E0001_axi4st**
+For example **top_drm_activator_0x0C001020A56E0001**
 
 In the above example, the *altchip_id_arria10* files correspond to the Arria 10
 FPGA family. Your `common` folder content might differ depending on the FPGA family you have

diff --git a/doc/drm_library_installation.rst b/doc/drm_library_installation.rst
@@ -24,7 +24,6 @@ Following OS are minimally tested only (without hardware):
 * Fedora (2 latest stable versions)
 * Ubuntu (2 latest stable versions)
 * Debian 10 Buster
-* Debian 9 Stretch
 
 .. 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

diff --git a/source/drm_manager.cpp b/source/drm_manager.cpp
@@ -65,8 +65,8 @@ limitations under the License.
     }                                     \
     catch( const std::exception &e ) {    \
         Fatal( e.what() );                \
-        throw;                            \
         sLogger->flush();                 \
+        throw;                            \
     }
 
 

diff --git a/tests/test_drm_license_error.py b/tests/test_drm_license_error.py
@@ -13,6 +13,7 @@
 from tests.proxy import get_context, set_context
 
 
+@pytest.mark.skip(reason='Waiting a fix from LGDN')
 @pytest.mark.no_parallel
 def test_header_error_on_key(accelize_drm, conf_json, cred_json, async_handler,
                     live_server, request):

diff --git a/tests/test_lgdn_topics.py b/tests/test_lgdn_topics.py
@@ -226,7 +226,7 @@ def test_endurance(accelize_drm, conf_json, cred_json, async_handler):
     driver = accelize_drm.pytest_fpga_driver[0]
     activators = accelize_drm.pytest_fpga_activators[0]
     async_cb = async_handler.create()
-    cred_json.set_user('accelize_accelerator_test_02')
+    cred_json.set_user('accelize_accelerator_test_05')
 
     # Get test duration
     try: