Merge branch '380-ci-checker-multiple-run' into 'master'

fix (ci_checker) : avoid conflicts when CI checker sessions run at the same time (#380)

Closes #380

See merge request postgres-ai/database-lab!542

Author: agneum

engine/cmd/runci/main.go

@@ -81,6 +81,18 @@ func main() {
 		return
 	}
 
+	if err := os.MkdirAll(source.RepoDir, 0666); err != nil {
+		log.Errf("failed to create a directory to download archives: %v", err)
+		return
+	}
+
+	defer func() {
+		if err := os.RemoveAll(source.RepoDir); err != nil {
+			log.Errf("failed to remove the directory with source code archives: %v", err)
+			return
+		}
+	}()
+
 	codeProvider := source.NewCodeProvider(ctx, &cfg.Source)
 
 	srv := runci.NewServer(cfg, dleClient, platformSvc, codeProvider, dockerCLI, networkID)
@@ -114,7 +126,7 @@ func discoverNetwork(ctx context.Context, cfg *runci.Config, dockerCLI *client.C
 	networkID := ""
 
 	for networkLabel, endpointSettings := range inspection.NetworkSettings.Networks {
-		if strings.HasPrefix(networkLabel, "network_") {
+		if strings.HasPrefix(networkLabel, networks.NetworkPrefix) {
 			networkResource, err := dockerCLI.NetworkInspect(ctx, endpointSettings.NetworkID, types.NetworkInspectOptions{})
 			if err != nil {
 				log.Err(err)

engine/internal/runci/source/github.go

@@ -44,7 +44,7 @@ func (cp *GHProvider) Download(ctx context.Context, opts Opts, outputFile string
 	log.Dbg(fmt.Sprintf("Download options: %#v", opts))
 
 	archiveLink, _, err := cp.client.Repositories.GetArchiveLink(ctx, opts.Owner, opts.Repo,
-		github.Zipball, &github.RepositoryContentGetOptions{Ref: opts.Ref}, true)
+		github.Zipball, &github.RepositoryContentGetOptions{Ref: getRunRef(opts)}, true)
 	if err != nil {
 		return errors.Wrap(err, "failed to download content")
 	}
@@ -72,6 +72,16 @@ func (cp *GHProvider) Download(ctx context.Context, opts Opts, outputFile string
 	return nil
 }
 
+func getRunRef(opts Opts) string {
+	ref := opts.Commit
+
+	if ref == "" {
+		ref = opts.Ref
+	}
+
+	return ref
+}
+
 // Extract extracts downloaded repository archive.
 func (cp *GHProvider) Extract(file string) (string, error) {
 	extractDirNameCmd := fmt.Sprintf("unzip -qql %s | head -n1 | tr -s ' ' | cut -d' ' -f5-", file)
@@ -85,14 +95,19 @@ func (cp *GHProvider) Extract(file string) (string, error) {
 
 	log.Dbg("Archive directory: ", string(bytes.TrimSpace(dirName)))
 
-	resp, err := exec.Command("unzip", "-d", RepoDir, file).CombinedOutput()
+	archiveDir, err := os.MkdirTemp(RepoDir, "*_extract")
+	if err != nil {
+		return "", err
+	}
+
+	resp, err := exec.Command("unzip", "-d", archiveDir, file).CombinedOutput()
 	log.Dbg("Response: ", string(resp))
 
 	if err != nil {
 		return "", err
 	}
 
-	source := path.Join(RepoDir, string(bytes.TrimSpace(dirName)))
+	source := path.Join(archiveDir, string(bytes.TrimSpace(dirName)))
 	log.Dbg("Source: ", source)
 
 	return source, nil

engine/pkg/util/networks/networks.go

@@ -23,8 +23,8 @@ const (
 	// InternalType contains name of the internal network type.
 	InternalType = "internal"
 
-	// networkPrefix defines a distinctive prefix for internal DLE networks.
-	networkPrefix = "dle_network_"
+	// NetworkPrefix defines a distinctive prefix for internal DLE networks.
+	NetworkPrefix = "dle_network_"
 )
 
 // Setup creates a new internal Docker network and connects container to it.
@@ -164,5 +164,5 @@ func hasContainerConnected(networkResource types.NetworkResource, containerID st
 }
 
 func getNetworkName(instanceID string) string {
-	return networkPrefix + instanceID
+	return NetworkPrefix + instanceID
 }