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

[WIP]RHDEVDOCS-3856 Establish Jenkins category under the CI/CD #43039

Merged
merged 1 commit into from
Mar 29, 2022
Merged

[WIP]RHDEVDOCS-3856 Establish Jenkins category under the CI/CD #43039

merged 1 commit into from
Mar 29, 2022

Conversation

rolfedh
Copy link
Contributor

@rolfedh rolfedh commented Mar 9, 2022

Purposes:

  • In the left nav, under "CI/CD", create a "Jenkins" node.
  • Where appropriate, use the "OpenShift Pipelines" product name instead of "Tekton".

Aligned team: Dev Tools

@openshift-ci openshift-ci bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Mar 9, 2022
@netlify
Copy link

netlify bot commented Mar 9, 2022

Deploy Preview for osdocs ready!

Name Link
🔨 Latest commit 26c0702
🔍 Latest deploy log https://app.netlify.com/sites/osdocs/deploys/62420a058549ef0009709086
😎 Deploy Preview https://deploy-preview-43039--osdocs.netlify.app/openshift-enterprise/latest/cicd/jenkins/migrating-from-jenkins-to-openshift-pipelines
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site settings.

@rolfedh rolfedh changed the title RHDEVDOCS-3856 Establish Jenkins category under the CI/CD [WIP]RHDEVDOCS-3856 Establish Jenkins category under the CI/CD Mar 9, 2022
@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 9, 2022
@openshift-ci openshift-ci bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 24, 2022
@rolfedh rolfedh closed this Mar 24, 2022
@openshift-ci openshift-ci bot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Mar 24, 2022
@rolfedh rolfedh reopened this Mar 24, 2022
@openshift-ci openshift-ci bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Mar 24, 2022
@sounix000
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added lgtm Indicates that a PR is ready to be merged. and removed lgtm Indicates that a PR is ready to be merged. labels Mar 28, 2022
@openshift-ci
Copy link

openshift-ci bot commented Mar 28, 2022

New changes are detected. LGTM label has been removed.

@bburt-rh
Copy link
Contributor

/lgtm

@openshift-ci
Copy link

openshift-ci bot commented Mar 29, 2022

@bburt-rh: changing LGTM is restricted to collaborators

In response to this:

/lgtm

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@JStickler JStickler added dev-tools Label for all Odo/Pipelines/Helm/Developer Console/Perspective PRs branch/enterprise-4.11 labels Mar 29, 2022
@JStickler JStickler merged commit 2c1568c into openshift:main Mar 29, 2022
@JStickler
Copy link
Contributor

/cherry-pick enterprise-4.11

@JStickler JStickler added do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. and removed do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. labels Mar 29, 2022
@openshift-cherrypick-robot

@JStickler: #43039 failed to apply on top of branch "enterprise-4.11":

Applying: RHDEVDOCS-3856 Establish Jenkins category under the CI/CD
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
Falling back to patching base and 3-way merge...
Removing modules/jt-extending-tekton-capabilities-using-custom-tasks-and-scripts.adoc
Removing modules/jt-comparison-of-jenkins-tekton-execution-models.adoc
CONFLICT (content): Merge conflict in cicd/jenkins/snippets
CONFLICT (content): Merge conflict in cicd/jenkins/modules
CONFLICT (content): Merge conflict in cicd/jenkins/images
CONFLICT (content): Merge conflict in cicd/jenkins/_attributes
Removing cicd/jenkins-tekton/migrating-from-jenkins-to-tekton.adoc
Auto-merging _topic_maps/_topic_map.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 RHDEVDOCS-3856 Establish Jenkins category under the CI/CD
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick enterprise-4.11

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@gabemontero
Copy link
Contributor

Per our recent conversation the general direction here looks good @rolfedh

So yeah, as the next step (separate PR per our discussion) we would like to see "Configure Jenkins images" from https://deploy-preview-43039--osdocs.netlify.app/openshift-enterprise/latest/openshift_images/using_images/images-other-jenkins.html move under CI/CD -> Jenkins, BEFORE the migrating article.

And similarly "Jenkins agent" https://deploy-preview-43039--osdocs.netlify.app/openshift-enterprise/latest/openshift_images/using_images/images-other-jenkins-agent.html would slot in after "Configuring.." but before "Migrating..."

Then "Images -> Using Images" would become "Images -> Using Source-to-image" with the remaining 3 articles that are source to image centric (their titles might need some tweaking").

@bergerhoffer bergerhoffer added this to the Future Release milestone Mar 29, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
branch/enterprise-4.11 dev-tools Label for all Odo/Pipelines/Helm/Developer Console/Perspective PRs size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

10 participants