Merge pull request #50 from yangcao77/pipeline-default-branch

pass in branch name
redhat-appstudio · Apr 5, 2024 · e4aca28 · e4aca28
2 parents f67a95b + 010315d
commit e4aca28
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 3 deletions.
diff --git a/skeleton/backstage/template.yaml b/skeleton/backstage/template.yaml
@@ -145,6 +145,7 @@ spec:
           image: '${{ parameters.imageRegistry }}/${{ parameters.imageOrg }}/${{ parameters.imageName }}'
           tags: 'sed.edit.APPTAGS'
           owner: ${{ parameters.owner }} 
+          defaultBranch: ${{ parameters.branch }} 
     # This action creates a new GitHub repository and publishes the files in the workspace directory to the repository.
     - id: publish-github
       name: Publish Repository to GitHub
@@ -198,6 +199,7 @@ spec:
           gitSecretKey: ${GIT__SECRET__DEFAULT__KEY}
           webhookSecret: ${WEBHOOK__SECRET__DEFAULT__NAME}
           webhookSecretKey: ${WEBHOOK__SECRET__DEFAULT__KEY}
+          defaultBranch: main
     - action: fs:rename
       id: renameComponentDir
       name: Rename Component Directory

diff --git a/skeleton/gitops-template/.tekton/gitops-on-pull-request.yaml b/skeleton/gitops-template/.tekton/gitops-on-pull-request.yaml
@@ -4,7 +4,7 @@ metadata:
   name: ${{ values.name }}-gitops-on-pull-request
   annotations:
     pipelinesascode.tekton.dev/on-event: "[pull_request]"
-    pipelinesascode.tekton.dev/on-target-branch: "[main]"
+    pipelinesascode.tekton.dev/on-target-branch: "[${{ values.defaultBranch }}]"
     pipelinesascode.tekton.dev/pipeline: "https://raw.githubusercontent.com/redhat-appstudio/tssc-sample-pipelines/main/pac/pipelines/gitops-pull-request-rhtap.yaml"
     pipelinesascode.tekton.dev/task-0: "https://raw.githubusercontent.com/redhat-appstudio/tssc-sample-pipelines/main/pac/tasks/git-clone.yaml"
     pipelinesascode.tekton.dev/task-1: "https://raw.githubusercontent.com/redhat-appstudio/tssc-sample-pipelines/main/pac/tasks/gather-deploy-images.yaml"

diff --git a/skeleton/source-repo/.tekton/docker-pull-request.yaml b/skeleton/source-repo/.tekton/docker-pull-request.yaml
@@ -4,7 +4,7 @@ metadata:
   name: ${{ values.name }}-on-pull-request
   annotations:
     pipelinesascode.tekton.dev/on-event: "[pull_request]"
-    pipelinesascode.tekton.dev/on-target-branch: "[main]"
+    pipelinesascode.tekton.dev/on-target-branch: "[${{ values.defaultBranch }}]"
     pipelinesascode.tekton.dev/max-keep-runs: "2"
     pipelinesascode.tekton.dev/pipeline: "https://raw.githubusercontent.com/redhat-appstudio/tssc-sample-pipelines/main/pac/pipelines/docker-build-rhtap.yaml"
     pipelinesascode.tekton.dev/task-0: "https://raw.githubusercontent.com/redhat-appstudio/tssc-sample-pipelines/main/pac/tasks/init.yaml"

diff --git a/skeleton/source-repo/.tekton/docker-push.yaml b/skeleton/source-repo/.tekton/docker-push.yaml
@@ -4,7 +4,7 @@ metadata:
   name: ${{ values.name }}-on-push
   annotations:
     pipelinesascode.tekton.dev/on-event: "[push]"
-    pipelinesascode.tekton.dev/on-target-branch: "[main]"
+    pipelinesascode.tekton.dev/on-target-branch: "[${{ values.defaultBranch }}]"
     pipelinesascode.tekton.dev/max-keep-runs: "2"
     pipelinesascode.tekton.dev/pipeline: "https://raw.githubusercontent.com/redhat-appstudio/tssc-sample-pipelines/main/pac/pipelines/docker-build-rhtap.yaml"
     pipelinesascode.tekton.dev/task-0: "https://raw.githubusercontent.com/redhat-appstudio/tssc-sample-pipelines/main/pac/tasks/init.yaml"

diff --git a/templates/devfile-sample-code-with-quarkus-dance/template.yaml b/templates/devfile-sample-code-with-quarkus-dance/template.yaml
@@ -145,6 +145,7 @@ spec:
           image: '${{ parameters.imageRegistry }}/${{ parameters.imageOrg }}/${{ parameters.imageName }}'
           tags: '["java", "quarkus", "sscs", "sbom", "acs"]'
           owner: ${{ parameters.owner }} 
+          defaultBranch: ${{ parameters.branch }} 
     # This action creates a new GitHub repository and publishes the files in the workspace directory to the repository.
     - id: publish-github
       name: Publish Repository to GitHub
@@ -198,6 +199,7 @@ spec:
           gitSecretKey: password
           webhookSecret: pipelines-secret
           webhookSecretKey: webhook.secret
+          defaultBranch: main
     - action: fs:rename
       id: renameComponentDir
       name: Rename Component Directory

diff --git a/templates/devfile-sample-dotnet60-dance/template.yaml b/templates/devfile-sample-dotnet60-dance/template.yaml
@@ -145,6 +145,7 @@ spec:
           image: '${{ parameters.imageRegistry }}/${{ parameters.imageOrg }}/${{ parameters.imageName }}'
           tags: '["net", "sscs", "sbom", "acs"]'
           owner: ${{ parameters.owner }} 
+          defaultBranch: ${{ parameters.branch }} 
     # This action creates a new GitHub repository and publishes the files in the workspace directory to the repository.
     - id: publish-github
       name: Publish Repository to GitHub
@@ -198,6 +199,7 @@ spec:
           gitSecretKey: password
           webhookSecret: pipelines-secret
           webhookSecretKey: webhook.secret
+          defaultBranch: main
     - action: fs:rename
       id: renameComponentDir
       name: Rename Component Directory

diff --git a/templates/devfile-sample-go-dance/template.yaml b/templates/devfile-sample-go-dance/template.yaml
@@ -145,6 +145,7 @@ spec:
           image: '${{ parameters.imageRegistry }}/${{ parameters.imageOrg }}/${{ parameters.imageName }}'
           tags: '["go", "sscs", "sbom", "acs"]'
           owner: ${{ parameters.owner }} 
+          defaultBranch: ${{ parameters.branch }} 
     # This action creates a new GitHub repository and publishes the files in the workspace directory to the repository.
     - id: publish-github
       name: Publish Repository to GitHub
@@ -198,6 +199,7 @@ spec:
           gitSecretKey: password
           webhookSecret: pipelines-secret
           webhookSecretKey: webhook.secret
+          defaultBranch: main
     - action: fs:rename
       id: renameComponentDir
       name: Rename Component Directory

diff --git a/templates/devfile-sample-java-springboot-dance/template.yaml b/templates/devfile-sample-java-springboot-dance/template.yaml
@@ -145,6 +145,7 @@ spec:
           image: '${{ parameters.imageRegistry }}/${{ parameters.imageOrg }}/${{ parameters.imageName }}'
           tags: '["java", "spring", "sscs", "sbom", "acs"]'
           owner: ${{ parameters.owner }} 
+          defaultBranch: ${{ parameters.branch }} 
     # This action creates a new GitHub repository and publishes the files in the workspace directory to the repository.
     - id: publish-github
       name: Publish Repository to GitHub
@@ -198,6 +199,7 @@ spec:
           gitSecretKey: password
           webhookSecret: pipelines-secret
           webhookSecretKey: webhook.secret
+          defaultBranch: main
     - action: fs:rename
       id: renameComponentDir
       name: Rename Component Directory

diff --git a/templates/devfile-sample-nodejs-dance/template.yaml b/templates/devfile-sample-nodejs-dance/template.yaml
@@ -145,6 +145,7 @@ spec:
           image: '${{ parameters.imageRegistry }}/${{ parameters.imageOrg }}/${{ parameters.imageName }}'
           tags: '["nodejs", "express", "ubi8", "sscs", "sbom", "acs"]'
           owner: ${{ parameters.owner }} 
+          defaultBranch: ${{ parameters.branch }} 
     # This action creates a new GitHub repository and publishes the files in the workspace directory to the repository.
     - id: publish-github
       name: Publish Repository to GitHub
@@ -198,6 +199,7 @@ spec:
           gitSecretKey: password
           webhookSecret: pipelines-secret
           webhookSecretKey: webhook.secret
+          defaultBranch: main
     - action: fs:rename
       id: renameComponentDir
       name: Rename Component Directory

diff --git a/templates/devfile-sample-python-dance/template.yaml b/templates/devfile-sample-python-dance/template.yaml
@@ -145,6 +145,7 @@ spec:
           image: '${{ parameters.imageRegistry }}/${{ parameters.imageOrg }}/${{ parameters.imageName }}'
           tags: '["python", "pip", "flask", "sscs", "sbom", "acs"]'
           owner: ${{ parameters.owner }} 
+          defaultBranch: ${{ parameters.branch }} 
     # This action creates a new GitHub repository and publishes the files in the workspace directory to the repository.
     - id: publish-github
       name: Publish Repository to GitHub
@@ -198,6 +199,7 @@ spec:
           gitSecretKey: password
           webhookSecret: pipelines-secret
           webhookSecretKey: webhook.secret
+          defaultBranch: main
     - action: fs:rename
       id: renameComponentDir
       name: Rename Component Directory