Update gitlab config file

gitlab seems to require a .yml extension (not .yaml). The actual syntax was also quite wrong. And the image golang:1.20 does not need (nor contain 'sudo'). Signed-off-by: Marc Khouzam <[email protected]>
vmware-tanzu · May 3, 2023 · 10dda4d · 10dda4d
1 parent ee05e1d
commit 10dda4d
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 23 deletions.
diff --git a/cmd/plugin/builder/template/plugintemplates/gitlab-ci.yaml.tmpl b/cmd/plugin/builder/template/plugintemplates/gitlab-ci.yaml.tmpl
diff --git a/cmd/plugin/builder/template/plugintemplates/gitlab-ci.yml.tmpl b/cmd/plugin/builder/template/plugintemplates/gitlab-ci.yml.tmpl
@@ -0,0 +1,20 @@
+default:
+  image: golang:1.20
+
+stages:
+- build
+
+build-job:
+  stage: build
+  script:
+    - apt-get update
+    - apt-get install -y ca-certificates
+    - echo "deb https://storage.googleapis.com/tanzu-cli-os-packages/apt tanzu-cli-jessie main" | tee /etc/apt/sources.list.d/tanzu.list
+    - apt-get update --allow-insecure-repositories
+    - apt-get install -y tanzu-cli --allow-unauthenticated
+    - tanzu ceip-participation set false
+    - tanzu version
+    - tanzu plugin install builder
+    - make plugin-build-install-local
+    - make test
+    - make lint
diff --git a/cmd/plugin/builder/template/plugintemplates/templates.go b/cmd/plugin/builder/template/plugintemplates/templates.go
@@ -57,5 +57,5 @@ var GithubWorkflowBuild string
 
 // GitlabCI contains the Gitlab CI template
 //
-//go:embed gitlab-ci.yaml.tmpl
+//go:embed gitlab-ci.yml.tmpl
 var GitlabCI string
diff --git a/cmd/plugin/builder/template/root.go b/cmd/plugin/builder/template/root.go
@@ -22,7 +22,7 @@ var GitIgnore = Target{
 
 // GitLabCI target
 var GitLabCI = Target{
-	Filepath: ".gitlab-ci.yaml",
+	Filepath: ".gitlab-ci.yml",
 	Template: plugintemplates.GitlabCI,
 }