Skip to content

Commit

Permalink
Merge pull request #618 from galasa-dev/iss1985
Browse files Browse the repository at this point in the history
Iss1985 - Remove Simplatform Tekton pipelines
  • Loading branch information
jadecarino authored Sep 27, 2024
2 parents eea1b2e + 881f70f commit bc62af1
Show file tree
Hide file tree
Showing 8 changed files with 74 additions and 567 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ This directory is the single location for all Dockerfiles needed to build the im
| Base image (Most other images are built on top of this. Used to enable use of the Apache HTTP Server) | base |
| Maven repositories for the built Galasa core components | cli-binary |
| Galasa CLI | cli, cli-ibm |
| Galasa Simplatform | simplatform, simplatform-amd64, webapp |
| Galasa Resources site | resources |


Expand Down Expand Up @@ -103,6 +102,8 @@ This EventListener is triggered via webhook when code is pushed into the main br

## Pipelines

**TO DO: Remove this section / update with GitHub workflows**

Galasa's architecture means that the core components are built on top of each other, using artifacts from the previous components. The diagram below shows the links between components, starting from Wrapping. In some instances, the build pipeline for a component triggers the next pipeline in the chain, and in some instances, the component is not connected in the chain, but when it is rebuilt, it draws on artifacts from the other.

In the pipelines, you will see that during some of the Maven or Gradle builds, the Maven source is pointed at the Maven artifact repository of the previous component. So, Framework's Gradle build has the build argument _-PsourceMaven=https://development.galasa.dev/main/maven-repo/maven_ so it can use artifacts from Maven's build.
Expand Down
20 changes: 0 additions & 20 deletions dockerfiles/simplatform/simplatform-amd64-dockerfile

This file was deleted.

11 changes: 0 additions & 11 deletions dockerfiles/simplatform/simplatform-dockerfile

This file was deleted.

6 changes: 3 additions & 3 deletions infrastructure/cicsk8s/galasa-dev/regression-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ spec:
- rm
- -rf
- /galasa/*
image: harbor.galasa.dev/galasadev/galasa-cli-ibm-amd64:stable
image: ghcr.io/galasa-dev/galasactl-ibm-x86_64:main
imagePullPolicy: Always
resources: {}
terminationMessagePath: /dev/termination-log
Expand Down Expand Up @@ -70,7 +70,7 @@ spec:
- compilation
- --log
- '-'
image: harbor.galasa.dev/galasadev/galasa-cli-ibm-amd64:stable
image: ghcr.io/galasa-dev/galasactl-ibm-x86_64:main
imagePullPolicy: IfNotPresent
resources: {}
terminationMessagePath: /dev/termination-log
Expand Down Expand Up @@ -110,7 +110,7 @@ spec:
- --noexitcodeontestfailures
- --log
- '-'
image: harbor.galasa.dev/galasadev/galasa-cli-ibm-amd64:stable
image: ghcr.io/galasa-dev/galasactl-ibm-x86_64:main
imagePullPolicy: IfNotPresent
resources: {}
terminationMessagePath: /dev/termination-log
Expand Down
47 changes: 47 additions & 0 deletions pipelines/pipelines/dummy-pipelines/dummy-pipelines.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -675,6 +675,53 @@ metadata:
# Tell ArgoCD never to prune this pipeline definition.
annotations:
argocd.argoproj.io/sync-options: Prune=false
spec:
workspaces:
- name: git-workspace

---

apiVersion: tekton.dev/v1
kind: Pipeline
metadata:
name: pr-simplatform
namespace: galasa-build
# Tell ArgoCD never to prune this pipeline definition.
annotations:
argocd.argoproj.io/sync-options: Prune=false
spec:
workspaces:
- name: git-workspace
params:
- name: headRef
type: string
- name: headSha
type: string
- name: baseRef
type: string
- name: prUrl
type: string
- name: statusesUrl
type: string
- name: issueUrl
type: string
- name: userId
type: string
- name: prNumber
type: string
- name: action
type: string

---

apiVersion: tekton.dev/v1
kind: Pipeline
metadata:
name: branch-simplatform
namespace: galasa-build
# Tell ArgoCD never to prune this pipeline definition.
annotations:
argocd.argoproj.io/sync-options: Prune=false
spec:
workspaces:
- name: git-workspace
261 changes: 0 additions & 261 deletions pipelines/pipelines/simplatform/build-branch.yaml

This file was deleted.

Loading

0 comments on commit bc62af1

Please sign in to comment.