ci: use runners provided by CNCF

Signed-off-by: Ramkumar Chinchani <rchincha@cisco.com>
project-zot · Oct 19, 2023 · 291a7c6 · 291a7c6
1 parent a44ca57
commit 291a7c6
Show file tree

Hide file tree

Showing 7 changed files with 54 additions and 19 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -18,7 +18,7 @@ jobs:
     permissions:
       contents: write
       packages: write
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-16-cores
     strategy:
       matrix:
         os: [linux, darwin, freebsd]

diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml
@@ -14,7 +14,7 @@ permissions: read-all
 jobs:
   dedupe:
     name: Dedupe/restore blobs
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-16-cores
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/clean-runner
@@ -62,7 +62,7 @@ jobs:
 
   sync:
     name: Sync harness
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-16-cores
     steps:
       - name: Check out source code
         uses: actions/checkout@v4
@@ -81,7 +81,7 @@ jobs:
 
   gc-referrers-stress-s3:
     name: GC(with referrers) on S3(localstack) with short interval
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-16-cores
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/clean-runner
@@ -118,7 +118,7 @@ jobs:
 
   gc-stress-s3:
     name: GC(without referrers) on S3(localstack) with short interval
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-16-cores
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/clean-runner
@@ -155,7 +155,7 @@ jobs:
 
   docker-image:
     name: Build docker image (for users still using Docker environments)
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-16-cores
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/clean-runner

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -14,7 +14,7 @@ permissions: read-all
 jobs:
   test-run-minimal:
     name: Running zot without extensions tests
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-16-cores
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/clean-runner
@@ -41,6 +41,8 @@ jobs:
       - uses: ./.github/actions/check-diskspace
       - name: run zot minimal tests
         run: |
+          lscpu
+          free --giga -h -t
           cd $GITHUB_WORKSPACE
           make test-minimal
         env:
@@ -57,7 +59,7 @@ jobs:
       - uses: ./.github/actions/teardown-localstack
   test-run-extensions:
     name: Run zot with extensions tests
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-16-cores
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/clean-runner
@@ -99,7 +101,7 @@ jobs:
       - uses: ./.github/actions/teardown-localstack
   test-run-devmode:
     name: Running privileged tests on Linux
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-16-cores
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/clean-runner

diff --git a/pkg/api/controller_test.go b/pkg/api/controller_test.go
@@ -26,6 +26,7 @@ import (
 	"testing"
 	"time"
 
+	guuid "github.com/gofrs/uuid"
 	"github.com/google/go-github/v52/github"
 	"github.com/gorilla/mux"
 	"github.com/gorilla/securecookie"
@@ -152,12 +153,17 @@ func TestCreateCacheDatabaseDriver(t *testing.T) {
 		}
 
 		endpoint := os.Getenv("DYNAMODBMOCK_ENDPOINT")
+		uuid, err := guuid.NewV4()
+		if err != nil {
+			panic(err)
+		}
+		tableName := "RepoTable-" + uuid.String()
 		conf.Storage.CacheDriver = map[string]interface{}{
 			"name":                  "dynamodb",
 			"endpoint":              endpoint,
 			"region":                "us-east-2",
 			"cacheTablename":        "BlobTable",
-			"repoMetaTablename":     "RepoMetadataTable",
+			"repoMetaTablename":     tableName,
 			"manifestDataTablename": "ManifestDataTable",
 			"userDataTablename":     "ZotUserDataTable",
 			"versionTablename":      "Version",
@@ -172,7 +178,7 @@ func TestCreateCacheDatabaseDriver(t *testing.T) {
 			"endpoint":              endpoint,
 			"region":                "us-east-2",
 			"cacheTablename":        "BlobTable",
-			"repoMetaTablename":     "RepoMetadataTable",
+			"repoMetaTablename":     tableName,
 			"manifestDataTablename": "ManifestDataTable",
 			"userDataTablename":     "ZotUserDataTable",
 			"versionTablename":      "Version",
@@ -186,7 +192,7 @@ func TestCreateCacheDatabaseDriver(t *testing.T) {
 			"endpoint":              endpoint,
 			"region":                "us-east-2",
 			"cacheTablename":        "BlobTable",
-			"repoMetaTablename":     "RepoMetadataTable",
+			"repoMetaTablename":     tableName,
 			"manifestDataTablename": "ManifestDataTable",
 			"userDataTablename":     "ZotUserDataTable",
 			"versionTablename":      "Version",
@@ -214,12 +220,17 @@ func TestCreateMetaDBDriver(t *testing.T) {
 			"skipverify":    false,
 		}
 
+		uuid, err := guuid.NewV4()
+		if err != nil {
+			panic(err)
+		}
+		tableName := "RepoTable-" + uuid.String()
 		conf.Storage.CacheDriver = map[string]interface{}{
 			"name":                  "dummy",
 			"endpoint":              "http://localhost:4566",
 			"region":                "us-east-2",
 			"cachetablename":        "BlobTable",
-			"repometatablename":     "RepoMetadataTable",
+			"repometatablename":     tableName,
 			"manifestdatatablename": "ManifestDataTable",
 			"userdatatablename":     "UserDatatable",
 		}
@@ -232,7 +243,7 @@ func TestCreateMetaDBDriver(t *testing.T) {
 			"endpoint":              "http://localhost:4566",
 			"region":                "us-east-2",
 			"cachetablename":        "",
-			"repometatablename":     "RepoMetadataTable",
+			"repometatablename":     tableName,
 			"manifestdatatablename": "ManifestDataTable",
 			"userDataTablename":     "ZotUserDataTable",
 			"versiontablename":      1,
@@ -246,7 +257,7 @@ func TestCreateMetaDBDriver(t *testing.T) {
 			"endpoint":              "http://localhost:4566",
 			"region":                "us-east-2",
 			"cachetablename":        "test",
-			"repometatablename":     "RepoMetadataTable",
+			"repometatablename":     tableName,
 			"manifestdatatablename": "ManifestDataTable",
 			"indexdatatablename":    "IndexDataTable",
 			"userdatatablename":     "ZotUserDataTable",
@@ -423,12 +434,17 @@ func TestObjectStorageController(t *testing.T) {
 		conf.Storage.RemoteCache = true
 		conf.Storage.StorageDriver = storageDriverParams
 
+		uuid, err := guuid.NewV4()
+		if err != nil {
+			panic(err)
+		}
+		tableName := "RepoTable-" + uuid.String()
 		conf.Storage.CacheDriver = map[string]interface{}{
 			"name":                  "dynamodb",
 			"endpoint":              os.Getenv("DYNAMODBMOCK_ENDPOINT"),
 			"region":                "us-east-2",
 			"cachetablename":        "test",
-			"repometatablename":     "RepoMetadataTable",
+			"repometatablename":     tableName,
 			"manifestdatatablename": "ManifestDataTable",
 			"indexdatatablename":    "IndexDataTable",
 			"userdatatablename":     "ZotUserDataTable",

diff --git a/pkg/meta/meta_test.go b/pkg/meta/meta_test.go
@@ -2691,10 +2691,15 @@ func generateTestImage() ([]byte, []byte, error) {
 func TestCreateDynamo(t *testing.T) {
 	tskip.SkipDynamo(t)
 
+	uuid, err := guuid.NewV4()
+	if err != nil {
+		panic(err)
+	}
+
 	Convey("Create", t, func() {
 		dynamoDBDriverParams := mdynamodb.DBDriverParameters{
 			Endpoint:              os.Getenv("DYNAMODBMOCK_ENDPOINT"),
-			RepoMetaTablename:     "RepoMetadataTable",
+			RepoMetaTablename:     "RepoMetadataTable" + uuid.String(),
 			ManifestDataTablename: "ManifestDataTable",
 			IndexDataTablename:    "IndexDataTable",
 			UserDataTablename:     "UserDataTable",

diff --git a/pkg/meta/parse_test.go b/pkg/meta/parse_test.go
@@ -9,6 +9,7 @@ import (
 	"path"
 	"testing"
 
+	guuid "github.com/gofrs/uuid"
 	godigest "github.com/opencontainers/go-digest"
 	ispec "github.com/opencontainers/image-spec/specs-go/v1"
 	. "github.com/smartystreets/goconvey/convey"
@@ -397,13 +398,18 @@ func TestParseStorageWithBoltDB(t *testing.T) {
 func TestParseStorageDynamoWrapper(t *testing.T) {
 	tskip.SkipDynamo(t)
 
+	uuid, err := guuid.NewV4()
+	if err != nil {
+		panic(err)
+	}
+
 	Convey("Dynamodb", t, func() {
 		rootDir := t.TempDir()
 
 		params := dynamodb.DBDriverParameters{
 			Endpoint:              os.Getenv("DYNAMODBMOCK_ENDPOINT"),
 			Region:                "us-east-2",
-			RepoMetaTablename:     "RepoMetadataTable",
+			RepoMetaTablename:     "RepoMetadataTable" + uuid.String(),
 			ManifestDataTablename: "ManifestDataTable",
 			IndexDataTablename:    "IndexDataTable",
 			UserDataTablename:     "UserDataTable",

diff --git a/pkg/meta/version/version_test.go b/pkg/meta/version/version_test.go
@@ -11,6 +11,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/dynamodb"
 	"github.com/aws/aws-sdk-go-v2/service/dynamodb/types"
 	"github.com/aws/aws-sdk-go/aws"
+	guuid "github.com/gofrs/uuid"
 	. "github.com/smartystreets/goconvey/convey"
 	"go.etcd.io/bbolt"
 
@@ -116,11 +117,16 @@ func setBoltDBVersion(db *bbolt.DB, vers string) error {
 func TestVersioningDynamoDB(t *testing.T) {
 	tskip.SkipDynamo(t)
 
+	uuid, err := guuid.NewV4()
+	if err != nil {
+		panic(err)
+	}
+
 	Convey("Tests", t, func() {
 		params := mdynamodb.DBDriverParameters{
 			Endpoint:              os.Getenv("DYNAMODBMOCK_ENDPOINT"),
 			Region:                "us-east-2",
-			RepoMetaTablename:     "RepoMetadataTable",
+			RepoMetaTablename:     "RepoMetadataTable" + uuid.String(),
 			ManifestDataTablename: "ManifestDataTable",
 			IndexDataTablename:    "IndexDataTable",
 			UserDataTablename:     "UserDataTable",