Skip to content

chore: rename .ibm folder to .ci (backport to release-1.8)#4358

Merged
openshift-merge-bot[bot] merged 3 commits intoredhat-developer:release-1.8from
gustavolira:change-ibm-folder-name-1.8
Mar 4, 2026
Merged

chore: rename .ibm folder to .ci (backport to release-1.8)#4358
openshift-merge-bot[bot] merged 3 commits intoredhat-developer:release-1.8from
gustavolira:change-ibm-folder-name-1.8

Conversation

@gustavolira
Copy link
Copy Markdown
Member

Summary

  • Backport of chore: rename .ibm folder to .ci #4333 to the release-1.8 branch
  • Renames the .ibm directory to .ci to better reflect its purpose as a CI/testing directory
  • Updates all internal references (shellcheck directives, GitHub workflows, documentation, configs, test files) from .ibm to .ci
  • Renames IBM_VALUES_SHOWCASE_* test variables to CI_VALUES_SHOWCASE_*
  • Regenerates .ci/yarn.lock to reflect the package name change
  • Preserves legitimate IBM Cloud references (ibmcloud CLI, IBM_CLOUD_API_KEY, cluster/ibm/ provider, IBM product URLs)

Test plan

  • Verify CI pipelines pass with the new directory name
  • Verify git grep '\.ibm' only shows legitimate IBM Cloud/product references
  • Verify shellcheck directives point to correct paths

🤖 Generated with Claude Code

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@rhdh-qodo-merge
Copy link
Copy Markdown

PR Reviewer Guide 🔍

Here are some key observations to aid the review process:

⏱️ Estimated effort to review: 3 🔵🔵🔵⚪⚪
🔒 No security concerns identified
⚡ Recommended focus areas for review

Naming Mismatch

The test suite still labels the value files as ibm in the describe(...) strings while the referenced paths/variables were renamed to .ci/CI_VALUES_SHOWCASE_*. This can confuse future maintainers and make failures harder to interpret; consider updating the human-readable test descriptions to match the new .ci naming.

describe("(ibm: values_showcase.yaml) should have a valid config", () => {
  const config = parseYamlFile<GlobalDynamicPluginsConfig>(
    CI_VALUES_SHOWCASE_CONFIG_FILE,
  );

  const externalDynamicPluginsConfig: DynamicPluginConfig[] = [
Script Integration

A new helm.sh install-method script was added that only sources utils.sh. Validate that this file is actually referenced/used by the pipeline entrypoints that need it (or add a brief comment explaining its role), and ensure it has the expected executable permissions in the repo since it’s a new shell entrypoint.

#!/bin/bash

# shellcheck source=.ci/pipelines/utils.sh
source "$DIR"/utils.sh
📄 References
  1. redhat-developer/rhdh-chart/charts/backstage/ci/with-custom-image-for-test-pod-values.yaml [1-15]
  2. redhat-developer/rhdh-chart/charts/orchestrator-software-templates-infra/ci/upstream-values.yaml [1-27]
  3. redhat-developer/rhdh-chart/charts/orchestrator-software-templates-infra/templates/openshift-gitops/post-cleanup.yaml [0-2]
  4. redhat-developer/rhdh-chart/charts/backstage/templates/tests/test-secret.yaml [1-3]
  5. redhat-developer/rhdh-operator/config/profile/rhdh/plugin-deps/tekton.yaml [172-196]
  6. redhat-developer/rhdh-chart/charts/orchestrator-software-templates/templates/tekton/tekton-tasks.yaml [172-196]
  7. redhat-developer/rhdh-chart/charts/orchestrator-software-templates/templates/tekton/tekton-tasks.yaml [117-151]
  8. redhat-developer/rhdh-operator/config/profile/rhdh/plugin-deps/tekton.yaml [117-151]

@rhdh-qodo-merge
Copy link
Copy Markdown

PR Type

Enhancement


Description

  • Rename .ibm directory to .ci across entire codebase

  • Update all shellcheck directives and file references from .ibm to .ci

  • Rename test variables from IBM_VALUES_SHOWCASE_* to CI_VALUES_SHOWCASE_*

  • Update documentation, GitHub workflows, and configuration files with new directory paths


File Walkthrough

Relevant files
Configuration changes
29 files
wrappers.test.ts
Rename test config variables and paths to .ci                       
+9/-9     
cleanup.sh
Update shellcheck directives to .ci paths                               
+2/-2     
aks-helm-deployment.sh
Update shellcheck directives to .ci paths                               
+2/-2     
aks-operator-deployment.sh
Update shellcheck directives to .ci paths                               
+3/-3     
eks-helm-deployment.sh
Update shellcheck directives to .ci paths                               
+1/-1     
eks-operator-deployment.sh
Update shellcheck directives to .ci paths                               
+2/-2     
gcloud.sh
Update shellcheck directives to .ci paths                               
+2/-2     
gke-helm-deployment.sh
Update shellcheck directives to .ci paths                               
+3/-3     
gke-operator-deployment.sh
Update shellcheck directives to .ci paths                               
+4/-4     
helm.sh
Create new file with updated .ci path                                       
+4/-0     
operator.sh
Update shellcheck directives to .ci paths                               
+1/-1     
aks-helm.sh
Update shellcheck directives to .ci paths                               
+3/-3     
aks-operator.sh
Update shellcheck directives to .ci paths                               
+3/-3     
auth-providers.sh
Update shellcheck directives to .ci paths                               
+2/-2     
eks-helm.sh
Update shellcheck directives to .ci paths                               
+4/-4     
eks-operator.sh
Update shellcheck directives to .ci paths                               
+4/-4     
gke-helm.sh
Update shellcheck directives to .ci paths                               
+4/-4     
gke-operator.sh
Update shellcheck directives to .ci paths                               
+5/-5     
ocp-nightly.sh
Update shellcheck directives to .ci paths                               
+1/-1     
ocp-operator.sh
Update shellcheck directives to .ci paths                               
+2/-2     
upgrade.sh
Update shellcheck directives to .ci paths                               
+1/-1     
openshift-ci-tests.sh
Update all shellcheck directives to .ci paths                       
+19/-19 
utils.sh
Update shellcheck directives to .ci paths                               
+1/-1     
package.json
Update package name from .ibm to .ci                                         
+1/-1     
.dockerignore
Update .ibm references to .ci directory                                   
+2/-2     
action.yaml
Update non-essential directory patterns to .ci                     
+2/-2     
renovate.json
Update file path patterns to .ci directory                             
+1/-1     
bash-e2e-lint.yaml
Update workflow paths and working directory to .ci             
+4/-4     
push-e2e-runner.yaml
Update Dockerfile path to .ci directory                                   
+2/-2     
Documentation
7 files
README
Update documentation references to .ci paths                         
+4/-4     
README.md
Update documentation references to .ci paths                         
+2/-2     
README.md
Update documentation references to .ci paths                         
+1/-1     
ci-e2e-testing.mdc
Update glob patterns and references to .ci                             
+21/-21 
CI.md
Update documentation references to .ci paths                         
+3/-3     
README.md
Update documentation references to .ci paths                         
+3/-3     
enhanced-ci-reporting.md
Update documentation references to .ci paths                         
+5/-5     
Additional files
78 files
.lintstagedrc.json [link]   
.prettierrc.js [link]   
OWNERS [link]   
Dockerfile [link]   
README.md [link]   
install.sh [link]   
postgres-crt-secrets.yaml [link]   
postgress-cred-secret.yaml [link]   
values.yaml [link]   
secrets-rhdh-secrets.yaml [link]   
service-account-rhdh-secret.yaml [link]   
clear-database.sh [link]   
create-azure-tag-policy.sh [link]   
az.sh [link]   
aks-operator-ingress.yaml [link]   
aks-spot-patch.yaml [link]   
aws.sh [link]   
eks-operator-ingress.yaml [link]   
apply-labels-manual.sh [link]   
deploy-auto-labeler.sh [link]   
index.js [link]   
package.json [link]   
manifest.sh [link]   
frontend-config.yaml [link]   
gke-operator-ingress.yaml [link]   
create-openshift-cluster.sh [link]   
k8s-utils.sh [link]   
multiclusterhub.yaml [link]   
operator-group.yaml [link]   
README.md [link]   
create-osd.sh [link]   
destroy-osd.sh [link]   
env_variables.sh [link]   
ocp-pull.sh [link]   
ocp-cluster-claim-login.sh [link]   
reporting.sh [link]   
cluster-role-k8s.yaml [link]   
cluster-role-ocm.yaml [link]   
cluster-role-binding-k8s.yaml [link]   
cluster-role-binding-ocm.yaml [link]   
app-config-rhdh-rbac.yaml [link]   
app-config-rhdh.yaml [link]   
dynamic-global-floating-action-button-config.yaml [link]   
dynamic-global-header-config.yaml [link]   
dynamic-plugins-config.yaml [link]   
hello-world-pipeline-run.yaml [link]   
hello-world-pipeline.yaml [link]   
pipelines-operator.yaml [link]   
dynamic-plugins-root-PVC.yaml [link]   
postgres-cred.yaml [link]   
postgres-crt-rds.yaml [link]   
postgres.yaml [link]   
rds-app-config.yaml [link]   
values-showcase-postgres.yaml [link]   
redis-deployment.yaml [link]   
redis-secret.yaml [link]   
rhdh-start-rbac.yaml [link]   
rhdh-start-rbac_K8s.yaml [link]   
rhdh-start-runtime.yaml [link]   
rhdh-start.yaml [link]   
rhdh-start_K8s.yaml [link]   
service-account-rhdh.yaml [link]   
topology-test-ingress.yaml [link]   
topology-test-route.yaml [link]   
topology-test.yaml [link]   
diff-values_showcase-rbac_AKS.yaml [link]   
diff-values_showcase-rbac_EKS.yaml [link]   
diff-values_showcase-rbac_GKE.yaml [link]   
diff-values_showcase-sanity-plugins.yaml [link]   
diff-values_showcase_AKS.yaml [link]   
diff-values_showcase_EKS.yaml [link]   
diff-values_showcase_GKE.yaml [link]   
diff-values_showcase_upgrade.yaml [link]   
values_showcase-auth-providers.yaml [link]   
values_showcase-rbac.yaml [link]   
values_showcase.yaml [link]   
turbo.json [link]   
helm.sh +0/-4     

@rhdh-qodo-merge
Copy link
Copy Markdown

rhdh-qodo-merge Bot commented Mar 4, 2026

PR Code Suggestions ✨

No code suggestions found for the PR.

Comment thread .ci/pipelines/utils.sh
The URL pointing to previous release value files was still using
.ibm path. Since all release branches are being renamed, update
to .ci.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Mar 4, 2026

The container image build workflow finished with status: cancelled.

@zdrapela
Copy link
Copy Markdown
Member

zdrapela commented Mar 4, 2026

Please fix the prettier check.

@kadel
Copy link
Copy Markdown
Member

kadel commented Mar 4, 2026

/hold
After discussing with @gustavolira I'll merge this manually once openshift/release#75502 is merged

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Mar 4, 2026

The container image build workflow finished with status: cancelled.

Copy link
Copy Markdown
Member

@zdrapela zdrapela left a comment

Choose a reason for hiding this comment

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

The code looks ok.

@openshift-ci openshift-ci Bot added the lgtm label Mar 4, 2026
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Mar 4, 2026

Image was built and published successfully. It is available at:

@zdrapela
Copy link
Copy Markdown
Member

zdrapela commented Mar 4, 2026

/retest

@zdrapela
Copy link
Copy Markdown
Member

zdrapela commented Mar 4, 2026

/unhold

@zdrapela
Copy link
Copy Markdown
Member

zdrapela commented Mar 4, 2026

/test e2e-ocp-helm

@openshift-merge-bot openshift-merge-bot Bot merged commit a543baa into redhat-developer:release-1.8 Mar 4, 2026
15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants