review fixes

Author: daniel-cit

0-bootstrap/scripts/choose_build_type.sh

@@ -15,7 +15,7 @@
 # limitations under the License.
 
 # Define the base path where the build type files are
-SCRIPTS_DIR="$( dirname -- "$0"; )"
+SCRIPTS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 BASE_PATH="$SCRIPTS_DIR/.."
 TARGET_BUILD="$1"
 

helpers/foundation-deployer/README.md

@@ -73,7 +73,7 @@ Version 1.5.7 is the last version before the license model change. To use a late
 
 ### Prepare the deploy environment
 
-- Create a directory in the file system to host the Git Repositories that will be created (Cloud Source repositories, Github , or GitLab) and a copy of the terraform example foundation repository.
+- Create a directory in the file system to host the Git Repositories that will be created (Cloud Source repositories, Github, or GitLab) and a copy of the terraform example foundation repository.
 - Clone the `terraform-example-foundation` repository on this directory.
 
     ```text

helpers/foundation-deployer/github/github.go

@@ -84,7 +84,10 @@ func triggerNewBuild(t testing.TB, ctx context.Context, owner, repo, token, comm
 		},
 	}
 
-	// wait action creation
+	// wait for the new workflow run to be created and appear
+	// in the API results after re-running it
+	// needed because RerunWorkflowByID dos no return
+	// the ID of the new workflow
 	time.Sleep(30 * time.Second)
 
 	runs, _, err := client.Actions.ListRepositoryWorkflowRuns(ctx, owner, repo, opts)
@@ -267,10 +270,11 @@ func (g GH) WaitBuildSuccess(t testing.TB, owner, repo, token, commitSha, failur
 	var runID int64
 	var err error
 
-	ctx := context.Background()
-	// wait action creation
+	// wait for the new workflow and action to be created and appear in the API results
+	// after the code being pushed to the repository
 	time.Sleep(30 * time.Second)
 
+	ctx := context.Background()
 	runID, status, conclusion, err = g.GetLastActionState(t, ctx, owner, repo, token, commitSha)
 	if err != nil {
 		return err

helpers/foundation-deployer/gitlab/gitlab.go

@@ -202,10 +202,11 @@ func (g GL) WaitBuildSuccess(t testing.TB, owner, project, token, commitSha, fai
 	var jobID int
 	var err error
 
-	ctx := context.Background()
-	// wait job creation
+	// wait for the new job to be created and appear in the API results
+	// after the code being pushed to the project
 	time.Sleep(30 * time.Second)
 
+	ctx := context.Background()
 	status, jobID, err = g.GetLastJobStatusForSHA(t, ctx, owner, project, token, commitSha)
 	if err != nil {
 		return err