dynamic holodeck ci instance name

Signed-off-by: shiva kumar <shivaku@nvidia.com>
NVIDIA · Dec 15, 2024 · 974bb03 · 974bb03
1 parent d3280cd
commit 974bb03
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/cmd/action/ci/ci.go b/cmd/action/ci/ci.go
@@ -20,6 +20,7 @@ import (
 	"fmt"
 	"math/rand"
 	"os"
+	"strings"
 
 	"github.com/NVIDIA/holodeck/api/holodeck/v1alpha1"
 	"github.com/NVIDIA/holodeck/internal/logger"
@@ -133,7 +134,13 @@ func setCfgName(cfg *v1alpha1.Environment) {
 	// uid is unique for each run
 	uid := generateUID()
 
-	cfg.Name = fmt.Sprintf("ci%s-%s-%s", attempt, sha, uid)
+	actor := os.Getenv("GITHUB_ACTOR")
+	branchName := os.Getenv("GITHUB_REF_NAME")
+	repo_name := os.Getenv("GITHUB_REPOSITORY")
+	parts := strings.Split(repo_name, "/")
+	repoName := parts[len(parts)-1]
+
+	cfg.Name = fmt.Sprintf("ci%s-%s-%s-%s-%s-%s", attempt, actor, branchName, repoName, sha, uid)
 }
 
 func generateUID() string {

diff --git a/pkg/provisioner/templates/kubernetes.go b/pkg/provisioner/templates/kubernetes.go
@@ -95,10 +95,15 @@ export KUBECONFIG="${HOME}/.kube/config"
 
 # Install Calico
 # based on https://docs.tigera.io/calico/latest/getting-started/kubernetes/quickstart
-with_retry 3 10s kubectl --kubeconfig $KUBECONFIG apply -f https://raw.githubusercontent.com/projectcalico/calico/${CALICO_VERSION}/manifests/tigera-operator.yaml
+echo "SHIVAAAAAAAAAAAAAAAAAAAAA"
+#with_retry 3 10s kubectl --kubeconfig $KUBECONFIG apply -f https://raw.githubusercontent.com/projectcalico/calico/${CALICO_VERSION}/manifests/tigera-operator.yaml
+with_retry 3 10s kubectl --kubeconfig $KUBECONFIG create -f https://raw.githubusercontent.com/projectcalico/calico/${CALICO_VERSION}/manifests/tigera-operator.yaml
+#with_retry 3 10s kubectl --kubeconfig $KUBECONFIG apply -f https://raw.githubusercontent.com/projectcalico/calico/v3.25.0/manifests/tigera-operator.yaml
 # Calico CRDs created. Now we sleep for 10s to ensure they are fully registered in the K8s etcd
 sleep 10s
-with_retry 3 10s kubectl --kubeconfig $KUBECONFIG apply -f https://raw.githubusercontent.com/projectcalico/calico/${CALICO_VERSION}/manifests/custom-resources.yaml
+# with_retry 3 10s kubectl --kubeconfig $KUBECONFIG apply -f https://raw.githubusercontent.com/projectcalico/calico/${CALICO_VERSION}/manifests/custom-resources.yaml
+with_retry 3 10s kubectl --kubeconfig $KUBECONFIG create -f https://raw.githubusercontent.com/projectcalico/calico/${CALICO_VERSION}/manifests/custom-resources.yaml
+#with_retry 3 10s kubectl --kubeconfig $KUBECONFIG apply -f https://raw.githubusercontent.com/projectcalico/calico/v3.25.0/manifests/custom-resources.yaml
 # Make single-node cluster schedulable
 kubectl taint nodes --all node-role.kubernetes.io/control-plane:NoSchedule-
 kubectl label node --all node-role.kubernetes.io/worker=