j7s-os/j7s-os-buildah.yaml

@@ -20,7 +20,7 @@ spec:
   - name: source
   steps:
   - name: build
-    image: harbor.internal.jpace121.net/k8s/buildah:latest
+    image: quay.io/buildah/stable:v1.23.3
     workingDir: $(workspaces.source.path)
     script: |
       set -x

j7s-os/j7s-os-image-build.yaml

@@ -10,7 +10,7 @@ spec:
   results:
   - name: version-string
   steps:
-  - image: harbor.internal.jpace121.net/k8s/j7s-image-build:latest
+  - image: harbor.internal.jpace121.net/j7s-image-build:latest
     securityContext:
       privileged: true
     script: |

j7s-os/j7s-os-k8s-deploy.yaml

@@ -12,7 +12,7 @@ spec:
     - name: ssh-directory
   steps:
     - name: update-with-flux
-      image: harbor.internal.jpace121.net/k8s/gitssh:latest
+      image: harbor.internal.jpace121.net/gitssh:latest
       script: |
         #!/usr/bin/env bash
         set -x

j7s-os/j7s-os-pipeline.yaml

@@ -1,79 +0,0 @@
-# A pipeline to build j7s-os images.
-# Steps:
-#   Clone the j7s-os repo from onedev.
-#   Call make <> in the repo.
-#   Build and push a new deployment container.
-#   Deploy the deployment container as a service.
----
-apiVersion: tekton.dev/v1beta1
-kind: Pipeline
-metadata:
-  name: j7s-os-pipeline
-  namespace: j7s-ci
-spec:
-  description: Build and deploy j7s-os images.
-  params:
-  - name: make-image-name
-    type: string
-    description: The name of image to make in the os repo.
-  - name: branch
-    type: string
-    default: main
-    description: branch of j7s-os image to build.
-  workspaces:
-  - name: shared-data
-    description: Shared data.
-  - name: git-credentials
-    description: Tekton's ssh credentials
-  tasks:
-  - name: fetch-repo
-    workspaces:
-    - name: output
-      workspace: shared-data
-    - name: ssh-directory
-      workspace: git-credentials
-    params:
-    - name: url
-      value: ssh://git@git.jpace121.net:2222/public/j7s-os.git
-    - name: branch
-      value: $(params.branch)
-    taskRef:
-      name: j7s-git-clone
-  - name: image-build
-    runAfter: ["fetch-repo"]
-    workspaces:
-    - name: source
-      workspace: shared-data
-    params:
-    - name: image-name
-      value: $(params.make-image-name)
-    taskRef:
-      name: j7s-os-image-build
-  - name: build-deploy-image
-    runAfter: ["image-build"]
-    workspaces:
-    - name: source
-      workspace: shared-data
-    params:
-    - name: commit
-      value: $(params.make-image-name)
-    - name: image
-      value: j7s-os-deploy
-    - name: registry
-      value: harbor.internal.jpace121.net/library
-    - name: version
-      value: $(tasks.image-build.results.version-string)
-    taskRef:
-      name: j7s-os-buildah
-  - name: deploy-image
-    runAfter: ["build-deploy-image"]
-    workspaces:
-    - name: ssh-directory
-      workspace: git-credentials
-    params:
-    - name: image
-      value: harbor.internal.jpace121.net/library/j7s-os-deploy
-    - name: version
-      value: $(tasks.image-build.results.version-string)
-    taskRef:
-      name: j7s-os-k8s-deploy

j7s-os/kustomization.yaml

@@ -3,5 +3,4 @@ kind: Kustomization
 resources:
 - j7s-os-buildah.yaml
 - j7s-os-image-build.yaml
-- j7s-os-k8s-deploy.yaml
+- j7s-os-k8s-deploy.yaml
-- j7s-os-pipeline.yaml

runs/dev-contain-debian.yaml

@@ -1,28 +0,0 @@
-apiVersion: tekton.dev/v1beta1
-kind: PipelineRun
-metadata:
-  generateName: dev-contain-debian-
-  namespace: j7s-ci
-spec:
-  pipelineRef:
-    name: dev-contain-pipeline
-  workspaces:
-  - name: shared-data
-    volumeClaimTemplate:
-      spec:
-        accessModes:
-        - ReadWriteOnce
-        resources:
-          requests:
-            storage: 1Gi
-  - name: git-credentials
-    secret:
-      secretName: git-credentials
-  - name: deploy-credentials
-    secret:
-      secretName: deploy-credentials
-  params:
-  - name: branch
-    value: "packaging/debian"
-  - name: deploy
-    value: "true"

runs/dev-contain-rpm.yaml

@@ -1,28 +0,0 @@
-apiVersion: tekton.dev/v1beta1
-kind: PipelineRun
-metadata:
-  generateName: dev-contain-rpm-
-  namespace: j7s-ci
-spec:
-  pipelineRef:
-    name: dev-contain-pipeline
-  workspaces:
-  - name: shared-data
-    volumeClaimTemplate:
-      spec:
-        accessModes:
-        - ReadWriteOnce
-        resources:
-          requests:
-            storage: 1Gi
-  - name: git-credentials
-    secret:
-      secretName: git-credentials
-  - name: deploy-credentials
-    secret:
-      secretName: deploy-credentials
-  params:
-  - name: branch
-    value: "packaging/fedora"
-  - name: deploy
-    value: "true"