Skip to content

Commit

Permalink
Move workflows into workflows sub-directory
Browse files Browse the repository at this point in the history
Signed-off-by: gabriel-farache <[email protected]>
  • Loading branch information
gabriel-farache committed Nov 29, 2024
1 parent 9f2dacd commit a473910
Show file tree
Hide file tree
Showing 212 changed files with 42 additions and 41 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/create-ocp-project.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
push:
branches: [ "main" ]
paths:
- 'create-ocp-project/**'
- 'workflows/create-ocp-project/**'
- 'pipeline/**'
- .github/workflows/create-ocp-project.yaml
- .github/workflows/main.yml
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/escalation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
push:
branches: [ "main" ]
paths:
- 'escalation/**'
- 'workflows/escalation/**'
- 'pipeline/**'
- 'scripts/**'
- .github/workflows/escalation.yml
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/extendable-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
push:
branches: [ "main" ]
paths:
- 'extendable-workflow/**'
- 'workflows/extendable-workflow/**'
- 'pipeline/**'
- .github/workflows/extendable-workflow.yml
- .github/workflows/main.yml
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/greeting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
push:
branches: [ "main" ]
paths:
- 'greeting/**'
- 'workflows/greeting/**'
- 'pipeline/**'
- .github/workflows/greeting.yml
- .github/workflows/main.yml
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/jira-listener.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
push:
branches: [ "main" ]
paths:
- 'escalation/jira-listener/**'
- 'workflows/escalation/jira-listener/**'
- 'pipeline/**'
- 'scripts/**'
- .github/workflows/jira-listener.yml
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/m2k-func.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
default: false

env:
WORKDIR: move2kube/m2k-func
WORKDIR: workflows/move2kube/m2k-func
MVN_OPTS: ""
WF_CONFIG_REPO: parodos-dev/serverless-workflows-config
REGISTRY_REPO: orchestrator
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/modify-vm-resources.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
push:
branches: [ "main" ]
paths:
- 'modify-vm-resources/**'
- 'workflows/modify-vm-resources/**'
- 'pipeline/**'
- .github/workflows/modify-vm-resources.yaml
- .github/workflows/main.yml
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/move2kube-e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
branches:
- main
paths:
- 'move2kube/**'
- 'workflows/move2kube/**'
- 'pipeline/**'
- .github/workflows/move2kube-e2e.yaml
- .github/workflows/m2k-func.yaml
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/move2kube.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
push:
branches: [ "main" ]
paths:
- 'move2kube/**'
- 'workflows/move2kube/**'
- 'pipeline/**'
- 'e2e/move2kube.sh'
- .github/workflows/move2kube-e2e.yaml
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/mta-v7.x-e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ on:
branches:
- main
paths:
- 'mta-v7.x/**'
- 'workflows/mta-v7.x/**'
- 'pipeline/**'
- '!e2e/mta-v7.x.sh'
- '!mta-v7.x/*.svg'
- '!workflows/mta-v7.x/*.svg'
- .github/workflows/mta-v7.x-e2e.yaml
- .github/workflows/main.yml

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mta-v7.x.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
push:
branches: [ "main" ]
paths:
- 'mta-v7.x/**'
- 'workflows/mta-v7.x/**'
- 'pipeline/**'
- .github/workflows/mta-v7.x.yml
- .github/workflows/main.yml
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mtv-migration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
push:
branches: ["main"]
paths:
- "mtv-migration/**"
- "workflows/mtv-migration/**"
- "pipeline/**"
- .github/workflows/mtv-migration.yml
- .github/workflows/main.yml
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mtv-plan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
push:
branches: ["main"]
paths:
- "mtv-plan/**"
- "workflows/mtv-plan/**"
- "pipeline/**"
- .github/workflows/mtv-plan.yml
- .github/workflows/main.yml
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/request-vm-cnv.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
push:
branches: [ "main" ]
paths:
- 'request-vm-cnv/**'
- 'workflows/request-vm-cnv/**'
- 'pipeline/**'
- .github/workflows/request-vm-cnv.yaml
- .github/workflows/main.yml
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rpj.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
push:
branches: ["main"]
paths:
- "rpj/**"
- "workflows/rpj/**"
- "pipeline/**"
- .github/workflows/rpj.yml
- .github/workflows/main.yml
Expand Down
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Serverless workflows generated files
*/manifests/
workflows/*/manifests/

#Maven
target/
**/target/
pom.xml.tag
pom.xml.releaseBackup
pom.xml.versionsBackup
Expand Down
8 changes: 4 additions & 4 deletions .tekton/m2k-func-pull-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
pipelinesascode.tekton.dev/max-keep-runs: "3"
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
== "main" && ( "move2kube/m2k-func/***".pathChanged() || ".tekton/m2k-func-pull-request.yaml".pathChanged()
== "main" && ( "workflows/move2kube/m2k-func/***".pathChanged() || ".tekton/m2k-func-pull-request.yaml".pathChanged()
)
creationTimestamp: null
labels:
Expand All @@ -28,11 +28,11 @@ spec:
- name: image-expires-after
value: 5d
- name: dockerfile
value: move2kube/m2k-func/src/main/docker/Dockerfile.jvm
value: workflows/move2kube/m2k-func/src/main/docker/Dockerfile.jvm
- name: path-context
value: move2kube/m2k-func
value: workflows/move2kube/m2k-func
- name: build-args-file
value: move2kube/m2k-func/argfile.conf
value: workflows/move2kube/m2k-func/argfile.conf
pipelineSpec:
finally:
- name: show-sbom
Expand Down
4 changes: 2 additions & 2 deletions .tekton/m2k-func-push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ spec:
- name: output-image
value: quay.io/redhat-user-workloads/orchestrator-releng-tenant/serverless-workflows/m2k-func:{{revision}}
- name: dockerfile
value: move2kube/m2k-func/src/main/docker/Dockerfile.jvm
value: workflows/move2kube/m2k-func/src/main/docker/Dockerfile.jvm
- name: path-context
value: move2kube/m2k-func
- name: build-args-file
value: move2kube/m2k-func/argfile.conf
value: workflows/move2kube/m2k-func/argfile.conf
pipelineSpec:
finally:
- name: show-sbom
Expand Down
6 changes: 3 additions & 3 deletions .tekton/move2kube-serverless-workflow-pull-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}'
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
pipelinesascode.tekton.dev/max-keep-runs: "3"
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch == "main" && ( "move2kube/***".pathChanged() || ".tekton/move2kube-serverless-workflow-pull-request.yaml".pathChanged() || "pipeline/workflow-builder.Dockerfile".pathChanged() )
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch == "main" && ( "workflows/move2kube/***".pathChanged() || ".tekton/move2kube-serverless-workflow-pull-request.yaml".pathChanged() || "pipeline/workflow-builder.Dockerfile".pathChanged() )
creationTimestamp: null
labels:
appstudio.openshift.io/application: serverless-workflows
Expand All @@ -26,13 +26,13 @@ spec:
- name: output-image
value: quay.io/redhat-user-workloads/orchestrator-releng-tenant/serverless-workflows/move2kube-serverless-workflow:on-pr-{{revision}}
- name: path-context
value: move2kube
value: workflows/move2kube
- name: revision
value: '{{revision}}'
- name: build-source-image
value: "true"
- name: build-args-file
value: move2kube/argfile.conf
value: workflows/move2kube/argfile.conf
pipelineSpec:
finally:
- name: show-sbom
Expand Down
4 changes: 2 additions & 2 deletions .tekton/move2kube-serverless-workflow-push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ spec:
- name: output-image
value: quay.io/redhat-user-workloads/orchestrator-releng-tenant/serverless-workflows/move2kube-serverless-workflow:{{revision}}
- name: path-context
value: move2kube
value: workflows/move2kube
- name: revision
value: '{{revision}}'
- name: build-source-image
value: "true"
- name: build-args-file
value: move2kube/argfile.conf
value: workflows/move2kube/argfile.conf
pipelineSpec:
finally:
- name: show-sbom
Expand Down
6 changes: 3 additions & 3 deletions .tekton/mta-serverless-workflow-pull-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}'
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
pipelinesascode.tekton.dev/max-keep-runs: "3"
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch == "main" && ( "mta-v7.x/***".pathChanged() || ".tekton/mta-serverless-workflow-pull-request.yaml".pathChanged() || "pipeline/workflow-builder.Dockerfile".pathChanged() )
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch == "main" && ( "workflows/mta-v7.x/***".pathChanged() || ".tekton/mta-serverless-workflow-pull-request.yaml".pathChanged() || "pipeline/workflow-builder.Dockerfile".pathChanged() )
creationTimestamp: null
labels:
appstudio.openshift.io/application: serverless-workflows
Expand All @@ -26,13 +26,13 @@ spec:
- name: output-image
value: quay.io/redhat-user-workloads/orchestrator-releng-tenant/serverless-workflows/mta-serverless-workflow:on-pr-{{revision}}
- name: path-context
value: mta-v7.x
value: workflows/mta-v7.x
- name: revision
value: '{{revision}}'
- name: build-source-image
value: "true"
- name: build-args-file
value: mta-v7.x/argfile.conf
value: workflows/mta-v7.x/argfile.conf
pipelineSpec:
finally:
- name: show-sbom
Expand Down
4 changes: 2 additions & 2 deletions .tekton/mta-serverless-workflow-push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ spec:
- name: output-image
value: quay.io/redhat-user-workloads/orchestrator-releng-tenant/serverless-workflows/mta-serverless-workflow:{{revision}}
- name: path-context
value: mta-v7.x
value: workflows/mta-v7.x
- name: revision
value: '{{revision}}'
- name: build-source-image
value: "true"
- name: build-args-file
value: mta-v7.x/argfile.conf
value: workflows/mta-v7.x/argfile.conf
pipelineSpec:
finally:
- name: show-sbom
Expand Down
12 changes: 6 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ prepare-workdir:
@rm -rf $(WORKDIR)
@mkdir -p $(WORKDIR)
@cp -R . $(WORKDIR)
@cp -R $(WORKDIR)/shared $(WORKDIR)/$(WORKFLOW_ID)/shared
@cp -R $(WORKDIR)/workflows/shared $(WORKDIR)/workflows/$(WORKFLOW_ID)/shared
@find $(WORKDIR) -type d -name target -prune -exec rm -rf {} \;


Expand All @@ -117,7 +117,7 @@ prepare-workdir:
# Depends on: prepare-workdir target.
# Usage: make build-image
ifeq ($(IS_WORKFLOW),true)
build-image: BUILD_ARGS=--build-arg-file=$(WORKFLOW_ID)/argfile.conf --build-arg=BUILDER_IMAGE=$(BUILDER_IMAGE) --build-arg WF_RESOURCES=$(WORKFLOW_ID)
build-image: BUILD_ARGS=--build-arg-file=workflows/$(WORKFLOW_ID)/argfile.conf --build-arg=BUILDER_IMAGE=$(BUILDER_IMAGE) --build-arg WF_RESOURCES=workflows/$(WORKFLOW_ID)
endif
build-image: EXTRA_ARGS=--ulimit nofile=4096:4096
build-image: prepare-workdir
Expand All @@ -126,7 +126,7 @@ ifeq ($(IS_APPLICATION),true)
# First build the application
$(BUILD_APPLICATION_SCRIPT) $(CONTAINER_ENGINE) $(WORKDIR) $(WORKFLOW_ID) $(APPLICATION_ID) $(JDK_IMAGE) $(MVN_OPTS)
# Then build the containerized image from the application source
@cd $(WORKDIR)/$(WORKFLOW_ID)/$(APPLICATION_ID) && $(CONTAINER_ENGINE) build -f $(DOCKERFILE) \
@cd $(WORKDIR)/workflows/$(WORKFLOW_ID)/$(APPLICATION_ID) && $(CONTAINER_ENGINE) build -f $(DOCKERFILE) \
$(BUILD_ARGS) $(EXTRA_ARGS) \
--tag ${IMAGE_NAME}:${IMAGE_TAG} --tag ${IMAGE_NAME}:latest .
else
Expand Down Expand Up @@ -167,9 +167,9 @@ save-oci: build-image
# Usage: make gen-manifests
gen-manifests: prepare-workdir
cd $(WORKDIR)
@$(CONTAINER_ENGINE) run --rm -v $(WORKDIR):/workdir:Z -w /workdir \
$(LINUX_IMAGE) /bin/bash -c "ENABLE_PERSISTENCE=$(ENABLE_PERSISTENCE) WORKFLOW_IMAGE_TAG=$(IMAGE_TAG) ${SCRIPTS_DIR}/gen_manifests.sh $(WORKFLOW_ID)"
@echo "Manifests are available in workdir $(WORKDIR)/$(WORKFLOW_ID)/manifests"
$(CONTAINER_ENGINE) run --rm -v $(WORKDIR):/workdir:Z -w /workdir \
$(LINUX_IMAGE) /bin/bash -c "ENABLE_PERSISTENCE=$(ENABLE_PERSISTENCE) WORKFLOW_IMAGE_TAG=$(IMAGE_TAG) ${SCRIPTS_DIR}/gen_manifests.sh workflows/$(WORKFLOW_ID)"
@echo "Manifests are available in workdir $(WORKDIR)/workflows/$(WORKFLOW_ID)/manifests"

remove-trailing-whitespaces:
@echo "Removing all trailing whitespaces from application.properties files"
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
# Possible values: OFF, FATAL, ERROR, WARN, INFO, DEBUG, ALL.
# and see https://quarkus.io/guides/logging for documentation
quarkus.log.category."org.apache.http".level=INFO
quarkus.log.level=INFO
quarkus.log.level=INFO
quarkus.flyway.migrate-at-start=true
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit a473910

Please sign in to comment.