fix: valid app name for docker registry

Signed-off-by: ankitm123 <[email protected]>

.lighthouse/jenkins-x/lint.yaml

@@ -0,0 +1,30 @@
+apiVersion: tekton.dev/v1beta1
+kind: PipelineRun
+metadata:
+  creationTimestamp: null
+  name: lint
+spec:
+  pipelineSpec:
+    tasks:
+    - name: jx-gitops-lint
+      resources: {}
+      taskSpec:
+        metadata: {}
+        stepTemplate:
+          image: uses:jenkins-x/jx3-pipeline-catalog/tasks/go/pullrequest.yaml@versionStream
+          name: ""
+          resources:
+            requests:
+              cpu: 400m
+              memory: 600Mi
+          workingDir: /workspace/source
+        steps:
+        - image: uses:jenkins-x/jx3-pipeline-catalog/tasks/git-clone/git-clone-pr.yaml@versionStream
+          name: ""
+          resources: {}
+        - name: make-lint
+          resources: {}
+  podTemplate: {}
+  serviceAccountName: tekton-bot
+  timeout: 30m0s
+status: {}

.lighthouse/jenkins-x/pullrequest.yaml

@@ -26,8 +26,6 @@ spec:
           resources: {}
         - name: build-make-linux
           resources: {}
-        - name: make-lint
-          resources: {}
         - name: build-make-test
           resources: {}
         - name: build-container-build

.lighthouse/jenkins-x/triggers.yaml

@@ -6,9 +6,16 @@ spec:
     context: "pr"
     always_run: true
     optional: false
-    trigger: "/test"
-    rerun_command: "/retest"
+    trigger: (?m)^/test( all| pr),?(s+|$)
+    rerun_command: /test pr
     source: "pullrequest.yaml"
+  - name: lint
+    context: "lint"
+    always_run: true
+    optional: false
+    trigger: (?m)^/test( all| lint),?(s+|$)
+    rerun_command: /test lint
+    source: "lint.yaml"
   postsubmits:
   - name: release
     context: "release"

pkg/cmd/variables/test_data/tests/nested/expected.sh

@@ -0,0 +1,20 @@
+
+# generated by: jx gitops variables
+export APP_NAME='mygroup-myrepo'
+export BRANCH_NAME='PR-23'
+export BUILD_NUMBER='5'
+export DOCKERFILE_PATH='Dockerfile'
+export DOCKER_REGISTRY='my-registry.com'
+export DOCKER_REGISTRY_ORG='myowner'
+export DOMAIN='mydomain.com'
+export GIT_BRANCH='mybranch'
+export JENKINS_X_URL='https://dashboard-mydomain.com/MyOwner/mygroup/myrepo/PR-23/5'
+export JX_CHART_REPOSITORY='http://bucketrepo/bucketrepo/charts/'
+export KANIKO_FLAGS='cheese'
+export MINK_AS='tekton-bot'
+export MINK_IMAGE='my-registry.com/myowner/mygroup/myrepo:1.2.3'
+export PIPELINE_KIND='pullrequest'
+export PUSH_CONTAINER_REGISTRY='localhost:5000'
+export REPO_NAME='mygroup/myrepo'
+export REPO_OWNER='MyOwner'
+export VERSION='1.2.3'

pkg/cmd/variables/variables.go

@@ -197,7 +197,7 @@ func (o *Options) Validate() error {
 		{
 			Name: "APP_NAME",
 			Function: func() (string, error) {
-				return o.Options.Repository, nil
+				return naming.ToValidName(o.Options.Repository), nil
 			},
 		},
 		{

pkg/cmd/variables/variables_test.go

@@ -88,7 +88,7 @@ func TestCmdVariables(t *testing.T) {
 		o.GitBranch = "mybranch"
 		o.DashboardURL = "https://dashboard-mydomain.com"
 
-		if name == "empty" {
+		if name == "empty" || name == "nested" {
 			o.Requirements = &requirements.Spec
 		}
 
@@ -107,6 +107,9 @@ func TestCmdVariables(t *testing.T) {
 		)
 		o.Options.Owner = "MyOwner"
 		o.Options.Repository = "myrepo"
+		if name == "nested" {
+			o.Options.Repository = "mygroup/myrepo"
+		}
 		o.Options.Branch = "PR-23"
 		o.Options.SourceURL = "https://github.com/" + o.Options.Owner + "/" + o.Options.Repository
 		o.Options.ScmClient = scmFake