From 3e9f045904ea466bf232920c879974854bd01707 Mon Sep 17 00:00:00 2001
From: Dmitry Tantsur <dtantsur@protonmail.com>
Date: Thu, 24 Oct 2024 16:54:24 +0200
Subject: [PATCH] chore: fix the CI, add 2024.2 to the functional tests

---
 .github/workflows/functional.yaml | 11 ++++-------
 src/common.rs                     |  2 +-
 src/endpointfilters.rs            |  2 +-
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/functional.yaml b/.github/workflows/functional.yaml
index 5f70294..bfaba58 100644
--- a/.github/workflows/functional.yaml
+++ b/.github/workflows/functional.yaml
@@ -10,18 +10,15 @@ jobs:
         openstack_version: ["master"]
         ubuntu_version: ["22.04"]
         include:
+          - name: "dolmatian"
+            openstack_version: "stable/2024.2"
+            ubuntu_version: "22.04"
           - name: "caracal"
             openstack_version: "stable/2024.1"
             ubuntu_version: "22.04"
           - name: "bobcat"
             openstack_version: "stable/2023.2"
             ubuntu_version: "22.04"
-          - name: "antelope"
-            openstack_version: "stable/2023.1"
-            ubuntu_version: "22.04"
-          - name: "zed"
-            openstack_version: "stable/zed"
-            ubuntu_version: "22.04"
     runs-on: ubuntu-${{ matrix.ubuntu_version }}
     name: Deploy OpenStack ${{ matrix.name }} and run examples
     steps:
@@ -46,7 +43,7 @@ jobs:
         if: always()
       - name: Upload logs artifacts
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: functional-${{ matrix.name }}
           path: /tmp/devstack-logs/*
diff --git a/src/common.rs b/src/common.rs
index 317c6b2..1bac7fc 100644
--- a/src/common.rs
+++ b/src/common.rs
@@ -195,7 +195,7 @@ where
 }
 
 #[cfg(test)]
-pub mod test {
+pub(crate) mod test {
     use serde::{Deserialize, Serialize};
     use serde_json;
 
diff --git a/src/endpointfilters.rs b/src/endpointfilters.rs
index dfa9c74..f346512 100644
--- a/src/endpointfilters.rs
+++ b/src/endpointfilters.rs
@@ -313,7 +313,7 @@ pub mod test {
 
     #[test]
     fn test_valid_interfaces_basics() {
-        assert_eq!(std::mem::size_of::<ValidInterfaces>(), 4);
+        assert_eq!(size_of::<ValidInterfaces>(), 4);
 
         let empty = ValidInterfaces::empty();
         assert_eq!(empty.len(), 0);