From 7154cddcec9b595b9c943684cd21f7c15f55e107 Mon Sep 17 00:00:00 2001 From: James Pace Date: Sun, 29 Jan 2023 19:41:26 -0500 Subject: [PATCH] Move test job and friends to j7s-ci namespace. --- jobs/test-trigger-check.yaml | 6 +++++- namespaces/j7s-ci.yaml | 4 ++++ namespaces/j7s-dev-namspace.json | 10 ---------- pipelines/test-pipeline.yaml | 3 ++- serviceaccounts/tekton-bot.yaml | 4 +++- tasks/j7s-git-clone.yaml | 1 + tasks/j7s-onedev-file-bug.yaml | 1 + tasks/j7s-onedev-pr-review.yaml | 1 + triggers/test-trigger.yaml | 3 +++ 9 files changed, 20 insertions(+), 13 deletions(-) create mode 100644 namespaces/j7s-ci.yaml delete mode 100644 namespaces/j7s-dev-namspace.json diff --git a/jobs/test-trigger-check.yaml b/jobs/test-trigger-check.yaml index fcc2827..642b5a2 100644 --- a/jobs/test-trigger-check.yaml +++ b/jobs/test-trigger-check.yaml @@ -1,7 +1,11 @@ +# Keeping this as an example, but the test pipeline was changed +# at one point to show interoperability with PRs. +--- apiVersion: batch/v1 kind: Job metadata: name: test-trigger-check + namespace: j7s-ci spec: template: spec: @@ -12,6 +16,6 @@ spec: args: - "-c" - >- - curl -X POST http://el-test-pipeline-listener.default.svc.cluster.local:8080 -H 'Content-Type: application/json' -d '{}' + curl -X POST http://el-test-pipeline-listener.j7s-ci.svc.cluster.local:8080 -H 'Content-Type: application/json' -d '{}' restartPolicy: Never backoffLimit: 0 \ No newline at end of file diff --git a/namespaces/j7s-ci.yaml b/namespaces/j7s-ci.yaml new file mode 100644 index 0000000..9047d8e --- /dev/null +++ b/namespaces/j7s-ci.yaml @@ -0,0 +1,4 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: j7s-ci diff --git a/namespaces/j7s-dev-namspace.json b/namespaces/j7s-dev-namspace.json deleted file mode 100644 index c6bb2fe..0000000 --- a/namespaces/j7s-dev-namspace.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "apiVersion": "v1", - "kind": "Namespace", - "metadata": { - "name": "j7s-dev", - "labels": { - "name": "j7s-dev" - } - } -} diff --git a/pipelines/test-pipeline.yaml b/pipelines/test-pipeline.yaml index 0f37d71..19c527c 100644 --- a/pipelines/test-pipeline.yaml +++ b/pipelines/test-pipeline.yaml @@ -4,6 +4,7 @@ apiVersion: tekton.dev/v1beta1 kind: Pipeline metadata: name: test-pipeline + namespace: j7s-ci spec: description: "A test pipeline." workspaces: @@ -23,7 +24,7 @@ spec: workspace: git-credentials params: - name: url - value: ssh://git.jpace121.net:2222/job-test + value: ssh://git.jpace121.net:2222/tests/job-test - name: branch value: master taskRef: diff --git a/serviceaccounts/tekton-bot.yaml b/serviceaccounts/tekton-bot.yaml index 2e7a1e0..8014128 100644 --- a/serviceaccounts/tekton-bot.yaml +++ b/serviceaccounts/tekton-bot.yaml @@ -2,6 +2,7 @@ apiVersion: v1 kind: ServiceAccount metadata: name: tekton-bot + namespace: j7s-ci secrets: - name: git-credentials --- @@ -9,6 +10,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: name: tekton-bot-eventlistener-binding + namespace: j7s-ci subjects: - kind: ServiceAccount name: tekton-bot @@ -24,7 +26,7 @@ metadata: subjects: - kind: ServiceAccount name: tekton-bot - namespace: default + namespace: j7s-ci roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole diff --git a/tasks/j7s-git-clone.yaml b/tasks/j7s-git-clone.yaml index 2fcf710..063af94 100644 --- a/tasks/j7s-git-clone.yaml +++ b/tasks/j7s-git-clone.yaml @@ -2,6 +2,7 @@ apiVersion: tekton.dev/v1beta1 kind: Task metadata: name: j7s-git-clone + namespace: j7s-ci spec: workspaces: - name: output diff --git a/tasks/j7s-onedev-file-bug.yaml b/tasks/j7s-onedev-file-bug.yaml index ebb7294..105214b 100644 --- a/tasks/j7s-onedev-file-bug.yaml +++ b/tasks/j7s-onedev-file-bug.yaml @@ -2,6 +2,7 @@ apiVersion: tekton.dev/v1beta1 kind: Task metadata: name: j7s-onedev-file-bug + namespace: j7s-ci spec: params: - name: tekton-login-secret-name diff --git a/tasks/j7s-onedev-pr-review.yaml b/tasks/j7s-onedev-pr-review.yaml index cff33c9..491c458 100644 --- a/tasks/j7s-onedev-pr-review.yaml +++ b/tasks/j7s-onedev-pr-review.yaml @@ -2,6 +2,7 @@ apiVersion: tekton.dev/v1beta1 kind: Task metadata: name: j7s-onedev-pr-review + namespace: j7s-ci spec: params: - name: tekton-login-secret-name diff --git a/triggers/test-trigger.yaml b/triggers/test-trigger.yaml index 34251aa..856d4fc 100644 --- a/triggers/test-trigger.yaml +++ b/triggers/test-trigger.yaml @@ -3,6 +3,7 @@ apiVersion: triggers.tekton.dev/v1beta1 kind: EventListener metadata: name: test-pipeline-listener + namespace: j7s-ci spec: serviceAccountName: tekton-bot triggers: @@ -19,6 +20,7 @@ apiVersion: triggers.tekton.dev/v1beta1 kind: TriggerBinding metadata: name: test-pipeline-binding + namespace: j7s-ci spec: params: - name: pr-id @@ -28,6 +30,7 @@ apiVersion: triggers.tekton.dev/v1beta1 kind: TriggerTemplate metadata: name: test-pipeline-template + namespace: j7s-ci spec: params: - name: pr-id