Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New software template to add gitlab integration #92

Merged
merged 9 commits into from
Dec 5, 2024

Conversation

ElaiShalevRH
Copy link
Collaborator

@ElaiShalevRH ElaiShalevRH commented Nov 18, 2024

Closes https://issues.redhat.com/browse/FLPATH-1823

New Software Template to allow creating a Advanced and basic workflows with Gitlab integration (instead of github).
The user will provide as input the gitlab group, instance (host), and new project name of their choosing,
the workflow will use the software template to create the new software project in the provided gitlab location,
It will also create a new API token and gitlab variable to run a CI pipeline.

Actual Code changes:
adding the gitlab-workflow/ dir, gitlab-workflow/template.yaml, build/.ci-gitlab.yml, catalog-info.yaml files
There were some directory tree changes

@ElaiShalevRH ElaiShalevRH changed the title new template to add gitlab integration New software template to add gitlab integration Nov 18, 2024
Copy link
Collaborator

@gabriel-farache gabriel-farache left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Few questions; looks very good

scaffolder-templates/build/.gitlab-ci.yml Outdated Show resolved Hide resolved
scaffolder-templates/gitlab-workflow/template.yaml Outdated Show resolved Hide resolved
scaffolder-templates/gitlab-workflow/template.yaml Outdated Show resolved Hide resolved
scaffolder-templates/gitlab-workflow/template.yaml Outdated Show resolved Hide resolved
scaffolder-templates/build/.gitlab-ci.yml Outdated Show resolved Hide resolved
Copy link
Collaborator

@gabriel-farache gabriel-farache left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Is there any related PR to be opened to the orchestrator-helm-operator repo? Maybe the tekton https://github.com/parodos-dev/orchestrator-helm-operator/blob/main/helm-charts/orchestrator/templates/tekton-pipeline.yaml#L37

@ElaiShalevRH
Copy link
Collaborator Author

I opened this PR to the operator
rhdhorchestrator/orchestrator-helm-operator#379
Haven't tested it completely still

about the tekton pipline, do we need to update that pipeline with every change to the templates/operator? I haven't done so for the create Quay story

@gabriel-farache
Copy link
Collaborator

about the tekton pipline, do we need to update that pipeline with every change to the templates/operator? I haven't done so for the create Quay story

I guess not but I was wondering if GH and GL had different behaviour when we want to fetch and push or if all the tokens are passed correctly
If you tested end to end and it works I'm good with that

@ElaiShalevRH
Copy link
Collaborator Author

On rhdh I tested e2e by adding the gitlab integration to the app-config-rhdh-auth. I haven't tested my operator changes, but that is not related to the veracity of the templates changes

@gabriel-farache
Copy link
Collaborator

On rhdh I tested e2e by adding the gitlab integration to the app-config-rhdh-auth

With gitops enabled? So the tekton pipeline was executed fine and argoCD deployed the workflow on the cluster as expected as well?

I haven't tested my operator changes, but that is not related to the veracity of the templates changes

yes, that's unrelated to the pipelines, just the deployment of RHDH

@ElaiShalevRH
Copy link
Collaborator Author

ElaiShalevRH commented Nov 19, 2024

With gitops enabled? So the tekton pipeline was executed fine and argoCD deployed the workflow on the cluster as expected as well?

I may have not tested that part to completion. Maybe we should hold until

@ElaiShalevRH ElaiShalevRH force-pushed the gitlab-template branch 2 times, most recently from 5651b72 to 3c22f80 Compare November 27, 2024 09:53
Copy link
Collaborator

@gabriel-farache gabriel-farache left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need some changes for better UX and avoid manual change of URL or secret name if on GH or GL

Is the scope limited to the basic workflow?

scaffolder-templates/build/.gitlab-ci.yml Outdated Show resolved Hide resolved
scaffolder-templates/build/.gitlab-ci.yml Outdated Show resolved Hide resolved
scaffolder-templates/gitlab-workflow/template.yaml Outdated Show resolved Hide resolved
scaffolder-templates/gitlab-workflow/template.yaml Outdated Show resolved Hide resolved
scaffolder-templates/gitlab-workflow/template.yaml Outdated Show resolved Hide resolved
scaffolder-templates/build/.gitlab-ci.yml Outdated Show resolved Hide resolved
scaffolder-templates/gitops/bootstrap/README.md Outdated Show resolved Hide resolved
scaffolder-templates/gitops/bootstrap/README.md Outdated Show resolved Hide resolved
Copy link
Collaborator

@gabriel-farache gabriel-farache left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As long as basic and advanced workflow templates were E2E tested, it's good to go for me

@ElaiShalevRH
Copy link
Collaborator Author

@masayag

convertToFlat: false
targetPath: workflow
- id: addCIPipeline
name: Adding the gitlab pipeline for the Workflow
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

generally speaking, we wanted shorten titles for steps (more concise so they fit into the screen)

@masayag masayag merged commit 0c50cd6 into rhdhorchestrator:main Dec 5, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants