test: add a bullseye_nolock package to the tests

Add other nolock tests to exercise the package repos (the templates, etc).
GoogleContainerTools · Sep 22, 2024 · c038d26 · c038d26
1 parent c789aad
commit c038d26
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 129 deletions.
diff --git a/WORKSPACE.bazel b/WORKSPACE.bazel
@@ -36,6 +36,16 @@ load("@bullseye//:packages.bzl", "bullseye_packages")
 
 bullseye_packages()
 
+deb_index(
+    name = "bullseye_nolock",
+    manifest = "//examples/debian_snapshot:bullseye_nolock.yaml",
+    nolock = True,
+)
+
+load("@bullseye_nolock//:packages.bzl", "bullseye_nolock_packages")
+
+bullseye_nolock_packages()
+
 deb_index(
     name = "apt_security",
     manifest = "//examples/debian_snapshot_security:security.yaml",

diff --git a/e2e/smoke/BUILD b/e2e/smoke/BUILD
@@ -58,7 +58,7 @@ PACKAGES = [
     "@bullseye//ncurses-base",
     "@bullseye//libncurses6",
     "@bullseye//tzdata",
-    "@bullseye//bash",
+    "@bullseye_nolock//bash",
     "@bullseye//coreutils",
     "@bullseye//dpkg",
     "@bullseye//apt",

diff --git a/e2e/smoke/WORKSPACE.bazel b/e2e/smoke/WORKSPACE.bazel
@@ -62,3 +62,13 @@ deb_index(
 load("@bullseye//:packages.bzl", "bullseye_packages")
 
 bullseye_packages()
+
+deb_index(
+    name = "bullseye_nolock",
+    manifest = "//:bullseye.yaml",
+    nolock = True,
+)
+
+load("@bullseye_nolock//:packages.bzl", "bullseye_nolock_packages")
+
+bullseye_nolock_packages()
diff --git a/examples/debian_snapshot/BUILD.bazel b/examples/debian_snapshot/BUILD.bazel
@@ -58,7 +58,7 @@ PACKAGES = [
     "@bullseye//ncurses-base",
     "@bullseye//libncurses6",
     "@bullseye//tzdata",
-    "@bullseye//bash",
+    "@bullseye_nolock//bash",
     "@bullseye//coreutils",
     "@bullseye//dpkg",
     "@bullseye//apt",

diff --git a/examples/debian_snapshot/bullseye.lock.json b/examples/debian_snapshot/bullseye.lock.json
@@ -98,69 +98,6 @@
 			"url": "https://snapshot-cloudflare.debian.org/archive/debian/20240210T223313Z/pool/main/t/tzdata/tzdata_2024a-0+deb11u1_all.deb",
 			"version": "2024a-0+deb11u1"
 		},
-		{
-			"arch": "amd64",
-			"dependencies": [
-				{
-					"key": "debianutils_4.11.2_amd64",
-					"name": "debianutils",
-					"version": "4.11.2"
-				},
-				{
-					"key": "libc6_2.31-13-p-deb11u8_amd64",
-					"name": "libc6",
-					"version": "2.31-13+deb11u8"
-				},
-				{
-					"key": "libcrypt1_1-4.4.18-4_amd64",
-					"name": "libcrypt1",
-					"version": "1:4.4.18-4"
-				},
-				{
-					"key": "libgcc-s1_10.2.1-6_amd64",
-					"name": "libgcc-s1",
-					"version": "10.2.1-6"
-				},
-				{
-					"key": "gcc-10-base_10.2.1-6_amd64",
-					"name": "gcc-10-base",
-					"version": "10.2.1-6"
-				},
-				{
-					"key": "base-files_11.1-p-deb11u9_amd64",
-					"name": "base-files",
-					"version": "11.1+deb11u9"
-				},
-				{
-					"key": "libtinfo6_6.2-p-20201114-2-p-deb11u2_amd64",
-					"name": "libtinfo6",
-					"version": "6.2+20201114-2+deb11u2"
-				}
-			],
-			"key": "bash_5.1-2-p-deb11u1_amd64",
-			"name": "bash",
-			"sha256": "f702ef058e762d7208a9c83f6f6bbf02645533bfd615c54e8cdcce842cd57377",
-			"url": "https://snapshot-cloudflare.debian.org/archive/debian/20240210T223313Z/pool/main/b/bash/bash_5.1-2+deb11u1_amd64.deb",
-			"version": "5.1-2+deb11u1"
-		},
-		{
-			"arch": "amd64",
-			"dependencies": [],
-			"key": "debianutils_4.11.2_amd64",
-			"name": "debianutils",
-			"sha256": "83d21669c5957e3eaee20096a7d8c596bd07f57f1e95dc74f192b3fb7bb2e6a9",
-			"url": "https://snapshot-cloudflare.debian.org/archive/debian/20240210T223313Z/pool/main/d/debianutils/debianutils_4.11.2_amd64.deb",
-			"version": "4.11.2"
-		},
-		{
-			"arch": "amd64",
-			"dependencies": [],
-			"key": "base-files_11.1-p-deb11u9_amd64",
-			"name": "base-files",
-			"sha256": "1ff08cf6e1b97af1e37cda830f3658f9af43a906abb80a21951c81aea02ce230",
-			"url": "https://snapshot-cloudflare.debian.org/archive/debian/20240210T223313Z/pool/main/b/base-files/base-files_11.1+deb11u9_amd64.deb",
-			"version": "11.1+deb11u9"
-		},
 		{
 			"arch": "amd64",
 			"dependencies": [
@@ -1297,69 +1234,6 @@
 			"url": "https://snapshot-cloudflare.debian.org/archive/debian/20240210T223313Z/pool/main/t/tzdata/tzdata_2024a-0+deb11u1_all.deb",
 			"version": "2024a-0+deb11u1"
 		},
-		{
-			"arch": "arm64",
-			"dependencies": [
-				{
-					"key": "debianutils_4.11.2_arm64",
-					"name": "debianutils",
-					"version": "4.11.2"
-				},
-				{
-					"key": "libc6_2.31-13-p-deb11u8_arm64",
-					"name": "libc6",
-					"version": "2.31-13+deb11u8"
-				},
-				{
-					"key": "libcrypt1_1-4.4.18-4_arm64",
-					"name": "libcrypt1",
-					"version": "1:4.4.18-4"
-				},
-				{
-					"key": "libgcc-s1_10.2.1-6_arm64",
-					"name": "libgcc-s1",
-					"version": "10.2.1-6"
-				},
-				{
-					"key": "gcc-10-base_10.2.1-6_arm64",
-					"name": "gcc-10-base",
-					"version": "10.2.1-6"
-				},
-				{
-					"key": "base-files_11.1-p-deb11u9_arm64",
-					"name": "base-files",
-					"version": "11.1+deb11u9"
-				},
-				{
-					"key": "libtinfo6_6.2-p-20201114-2-p-deb11u2_arm64",
-					"name": "libtinfo6",
-					"version": "6.2+20201114-2+deb11u2"
-				}
-			],
-			"key": "bash_5.1-2-p-deb11u1_arm64",
-			"name": "bash",
-			"sha256": "d7c7af5d86f43a885069408a89788f67f248e8124c682bb73936f33874e0611b",
-			"url": "https://snapshot-cloudflare.debian.org/archive/debian/20240210T223313Z/pool/main/b/bash/bash_5.1-2+deb11u1_arm64.deb",
-			"version": "5.1-2+deb11u1"
-		},
-		{
-			"arch": "arm64",
-			"dependencies": [],
-			"key": "debianutils_4.11.2_arm64",
-			"name": "debianutils",
-			"sha256": "6543b2b1a61b4b7b4b55b4bd25162309d7d23d14d3303649aee84ad314c30e02",
-			"url": "https://snapshot-cloudflare.debian.org/archive/debian/20240210T223313Z/pool/main/d/debianutils/debianutils_4.11.2_arm64.deb",
-			"version": "4.11.2"
-		},
-		{
-			"arch": "arm64",
-			"dependencies": [],
-			"key": "base-files_11.1-p-deb11u9_arm64",
-			"name": "base-files",
-			"sha256": "c40dc4d5c6b82f5cfe75efa1a12bd09b9d5b9b8446ea045a991896a1ead8b02c",
-			"url": "https://snapshot-cloudflare.debian.org/archive/debian/20240210T223313Z/pool/main/b/base-files/base-files_11.1+deb11u9_arm64.deb",
-			"version": "11.1+deb11u9"
-		},
 		{
 			"arch": "arm64",
 			"dependencies": [

diff --git a/examples/debian_snapshot/bullseye.yaml b/examples/debian_snapshot/bullseye.yaml
@@ -25,7 +25,6 @@ packages:
   - "ncurses-base"
   - "libncurses6"
   - "tzdata"
-  - "bash"
   - "coreutils" # for commands like `ls`
   # for apt list --installed
   - "dpkg"

diff --git a/examples/debian_snapshot/bullseye_nolock.yaml b/examples/debian_snapshot/bullseye_nolock.yaml
@@ -0,0 +1,12 @@
+version: 1
+
+sources:
+  - channel: bullseye main
+    url: https://snapshot-cloudflare.debian.org/archive/debian/20240210T223313Z
+
+archs:
+  - "amd64"
+  - "arm64"
+
+packages:
+  - "bash"