Changes for CI and nsrlsvr end-to-end tests #4883 (#4882)

log2timeline · May 4, 2024 · 217a1c4 · 217a1c4
1 parent af5e658
commit 217a1c4
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 10 deletions.
diff --git a/.github/workflows/test_docker.yml b/.github/workflows/test_docker.yml
@@ -11,7 +11,7 @@ jobs:
     container:
       image: registry.fedoraproject.org/fedora:${{ matrix.version }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up container
       run: |
         dnf install -y dnf-plugins-core langpacks-en
@@ -41,7 +41,7 @@ jobs:
     container:
       image: ubuntu:${{ matrix.version }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up container
       env:
         DEBIAN_FRONTEND: noninteractive

diff --git a/.github/workflows/test_docs.yml b/.github/workflows/test_docs.yml
@@ -19,7 +19,7 @@ jobs:
     container:
       image: ubuntu:22.04
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up container
       env:
         DEBIAN_FRONTEND: noninteractive

diff --git a/.github/workflows/test_tox.yml b/.github/workflows/test_tox.yml
@@ -27,7 +27,7 @@ jobs:
     container:
       image: ubuntu:22.04
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up container
       env:
         DEBIAN_FRONTEND: noninteractive
@@ -63,7 +63,7 @@ jobs:
     container:
       image: ubuntu:22.04
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up container
       env:
         DEBIAN_FRONTEND: noninteractive
@@ -90,7 +90,9 @@ jobs:
       run: |
         tox -e${{ matrix.toxenv }}
     - name: Upload coverage report to Codecov
-      uses: codecov/codecov-action@v3
+      uses: codecov/codecov-action@v4
+      with:
+        token: ${{ secrets.CODECOV_TOKEN }}
   lint:
     runs-on: ubuntu-latest
     strategy:
@@ -101,7 +103,7 @@ jobs:
     container:
       image: ubuntu:22.04
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up container
       env:
         DEBIAN_FRONTEND: noninteractive

diff --git a/config/linux/ubuntu_install_nsrlsvr.sh b/config/linux/ubuntu_install_nsrlsvr.sh
@@ -38,15 +38,32 @@ then
 		then
 			# Download the minimum RDS hash set.
 			# Note that rds_modernm.zip is approximate 2 GiB in size.
-			curl -o rds_modernm.zip https://s3.amazonaws.com/rds.nsrl.nist.gov/RDS/current/rds_modernm.zip
+			curl -o rds_modernm.zip https://s3.amazonaws.com/rds.nsrl.nist.gov/RDS/rds_2024.03.1/RDS_2024.03.1_modern_minimal.zip
+		fi
+
+		if [ ! -f rds_modernm.zip ];
+		then
+			echo "Missing: rds_modernm.zip";
+
+			exit 1
 		fi
 		# Note that NSRLFile.txt is approximate 4 GiB in size.
 		unzip -x rds_modernm.zip rds_modernm/NSRLFile.txt
+
+		mv rds_modernm/NSRLFile.txt .
 	fi
+
+	if [ ! -f NSRLFile.txt ];
+	then
+		echo "Missing: NSRLFile.txt";
+
+		exit 1
+	fi
+
 	# Build the nsrlsvr hashes.txt file
 	sudo mkdir -p /usr/share/nsrlsvr
 	sudo touch /usr/share/nsrlsvr/hashes.txt
-	sudo /usr/bin/python3 /usr/bin/nsrlupdate rds_modernm/NSRLFile.txt
+	sudo /usr/bin/python3 /usr/bin/nsrlupdate NSRLFile.txt
 fi
 
 # For the sake of verbosity have nsrlsvr test its set up first

diff --git a/test_dependencies.ini b/test_dependencies.ini
@@ -1,6 +1,7 @@
 [fakeredis]
 dpkg_name: python3-fakeredis
 minimum_version: 1.4.1
+maximum_version: 2.21.3
 is_optional: true
 rpm_name: python3-fakeredis
 version_property: __version__

diff --git a/test_requirements.txt b/test_requirements.txt
@@ -1,2 +1,2 @@
-fakeredis >= 1.4.1
+fakeredis >= 1.4.1,< 2.21.3
 mock >= 2.0.0