Skip to content

Commit 43a63c1

Browse files
zdrapelaclaude
zdrapela
and
claude
committed
fix: correct local-run.sh CLI mode docs in fix-e2e skills
- Use full Prow CI job name for -j flag (not shortened names) - Add required -r flag for CLI mode (prevents interactive mode) - Add image repo mapping table per release branch Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent aef3cfb commit 43a63c1

12 files changed

Lines changed: 152 additions & 164 deletions

File tree

‎.claude/commands/fix-e2e.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,19 +52,19 @@ If a Jira ticket was provided, include the ticket ID in the branch name:
5252

5353
**Skill**: `deploy-rhdh`
5454

55-
Deploy RHDH to a cluster using `e2e-tests/local-run.sh`:
55+
Deploy RHDH to a cluster using `e2e-tests/local-run.sh`. CLI mode requires **all three** flags (`-j`, `-r`, `-t`):
5656

5757
```bash
5858
cd e2e-tests
59-
./local-run.sh -j <job-name> -t <image-tag> -s
59+
./local-run.sh -j <full-prow-job-name> -r <image-repo> -t <image-tag> -s
6060
```
6161

62-
Use deploy-only mode (`-s`) to skip automated test execution — we'll run the specific failing test manually.
62+
Use deploy-only mode (`-s`) to skip automated test execution — we'll run the specific failing test manually. Use the **full Prow CI job name** for `-j` (not shortened names).
6363

64-
Select the image tag based on the release branch:
65-
- `main` → `next`
66-
- `release-1.9` → `1.9`
67-
- `release-1.8` → `1.8`
64+
Select the image repo and tag based on the release branch:
65+
- `main` → `-r rhdh-community/rhdh -t next`
66+
- `release-1.9` → `-r rhdh/rhdh-hub-rhel9 -t 1.9`
67+
- `release-1.8` → `-r rhdh/rhdh-hub-rhel9 -t 1.8`
6868

6969
After deployment completes, set up the local test environment:
7070
```bash

‎.claude/rules/e2e-fix-workflow.md‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -77,23 +77,19 @@ Build logs and JUnit XML results are in the GCS artifacts directory. Look for Pl
7777

7878
#### Job Name → local-run.sh `-j` Parameter
7979

80-
| CI job pattern | local-run.sh job name |
81-
|----------------|----------------------|
82-
| `*ocp*helm*nightly*` | `nightly-ocp-helm` |
83-
| `*ocp*operator*nightly*` | `nightly-ocp-operator` |
84-
| `*ocp*operator*auth-providers*` | `nightly-ocp-operator-auth-providers` |
85-
| `*aks*helm*` | `nightly-aks-helm` |
86-
| `*eks*helm*` | `nightly-eks-helm` |
87-
| `*gke*helm*` | `nightly-gke-helm` |
88-
| `*pull*ocp*helm*` | `pull-ocp-helm` |
89-
90-
#### Release Branch → Image Tag
91-
92-
| Branch | Image tag |
93-
|--------|-----------|
94-
| `main` | `next` |
95-
| `release-1.9` | `1.9` |
96-
| `release-1.8` | `1.8` |
80+
Use the **full Prow CI job name** directly as the `-j` parameter. The `openshift-ci-tests.sh` handler uses bash glob patterns (like `*ocp*helm*nightly*`) to match the job name, so the full name works correctly.
81+
82+
**Example**: `./local-run.sh -j periodic-ci-redhat-developer-rhdh-main-e2e-ocp-v4-20-helm-nightly -r rhdh-community/rhdh -t next -s`
83+
84+
Do NOT use shortened names like `nightly-ocp-helm` — these do not match the glob patterns.
85+
86+
#### Release Branch → Image Repo and Tag
87+
88+
| Branch | `-r` (image repo) | `-t` (image tag) |
89+
|--------|-------------------|-------------------|
90+
| `main` | `rhdh-community/rhdh` | `next` |
91+
| `release-1.9` | `rhdh/rhdh-hub-rhel9` | `1.9` |
92+
| `release-1.8` | `rhdh/rhdh-hub-rhel9` | `1.8` |
9793

9894
## Branch and Deployment Setup
9995

@@ -108,9 +104,11 @@ git checkout -b fix/e2e-<description> upstream/<release-branch>
108104

109105
### Deployment via local-run.sh
110106

107+
CLI mode requires **all three** flags (`-j`, `-r`, `-t`). Without `-r`, the script enters interactive mode.
108+
111109
```bash
112110
cd e2e-tests
113-
./local-run.sh -j <job-name> -t <image-tag> -s # -s = deploy only, skip tests
111+
./local-run.sh -j <full-prow-job-name> -r <image-repo> -t <image-tag> -s # -s = deploy only, skip tests
114112
```
115113

116114
Prerequisites: `podman` (machine with 8GB RAM, 4 CPUs), `oc`, `vault`, `jq`, `curl`, `rsync`, `bc`.

‎.claude/skills/deploy-rhdh/SKILL.md‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -51,38 +51,37 @@ Vault authentication, cluster service account setup, RHDH deployment, and test e
5151

5252
### CLI Mode (Preferred)
5353

54+
CLI mode requires **all three** flags (`-j`, `-r`, `-t`) to avoid falling into interactive mode:
55+
5456
```bash
5557
cd e2e-tests
56-
./local-run.sh -j <job-name> [-t <image-tag>] [-s]
58+
./local-run.sh -j <full-prow-job-name> -r <image-repo> -t <image-tag> [-s]
5759
```
5860

5961
**Parameters:**
60-
- `-j / --job`: Job name (from `parse-ci-failure` output). Examples:
61-
- `nightly-ocp-helm` — OCP Helm deployment
62-
- `nightly-ocp-operator` — OCP Operator deployment
63-
- `nightly-aks-helm` — AKS Helm deployment
64-
- `pull-ocp-helm` — PR check deployment
65-
- `-t / --tag`: Image tag override (e.g., `1.9`, `next`, `1.9-123`)
62+
- `-j / --job`: The **full Prow CI job name** extracted from the Prow URL. The `openshift-ci-tests.sh` handler uses bash glob patterns (like `*ocp*helm*nightly*`) to match, so the full name works correctly. Example: `periodic-ci-redhat-developer-rhdh-main-e2e-ocp-v4-20-helm-nightly`
63+
- `-r / --repo`: Image repository (**required** for CLI mode — without it the script enters interactive mode)
64+
- `-t / --tag`: Image tag (e.g., `1.9`, `next`)
6665
- `-s / --skip-tests`: Deploy only, skip test execution (useful when you want to run tests manually afterward)
6766

68-
### Image Tag Selection
67+
Do NOT use shortened job names like `nightly-ocp-helm` for `-j` — these do not match the glob patterns in `openshift-ci-tests.sh`.
6968

70-
Match the image tag to the release branch:
69+
### Image Selection
7170

72-
| Release branch | Default image tag |
73-
|---------------|-------------------|
74-
| `main` | `next` (latest nightly from main) |
75-
| `release-1.9` | `1.9` (latest 1.9 nightly) |
76-
| `release-1.8` | `1.8` (latest 1.8 nightly) |
71+
Match the image repo and tag to the release branch:
7772

78-
The default image registry is `quay.io` and default repo is `rhdh/rhdh-hub-rhel9`.
73+
| Release branch | `-r` (image repo) | `-t` (image tag) |
74+
|---------------|-------------------|-------------------|
75+
| `main` | `rhdh-community/rhdh` | `next` |
76+
| `release-1.9` | `rhdh/rhdh-hub-rhel9` | `1.9` |
77+
| `release-1.8` | `rhdh/rhdh-hub-rhel9` | `1.8` |
7978

8079
### Deploy-Only Mode
8180

8281
For E2E fix work, deploy without running tests so you can run specific tests manually:
8382

8483
```bash
85-
./local-run.sh -j <job-name> -t <tag> -s
84+
./local-run.sh -j <full-prow-job-name> -r <image-repo> -t <tag> -s
8685
```
8786

8887
### What local-run.sh Does

‎.cursor/commands/fix-e2e.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,19 +49,19 @@ If a Jira ticket was provided, include the ticket ID in the branch name:
4949

5050
**Skill**: `deploy-rhdh`
5151

52-
Deploy RHDH to a cluster using `e2e-tests/local-run.sh`:
52+
Deploy RHDH to a cluster using `e2e-tests/local-run.sh`. CLI mode requires **all three** flags (`-j`, `-r`, `-t`):
5353

5454
```bash
5555
cd e2e-tests
56-
./local-run.sh -j <job-name> -t <image-tag> -s
56+
./local-run.sh -j <full-prow-job-name> -r <image-repo> -t <image-tag> -s
5757
```
5858

59-
Use deploy-only mode (`-s`) to skip automated test execution — we'll run the specific failing test manually.
59+
Use deploy-only mode (`-s`) to skip automated test execution — we'll run the specific failing test manually. Use the **full Prow CI job name** for `-j` (not shortened names).
6060

61-
Select the image tag based on the release branch:
62-
- `main` → `next`
63-
- `release-1.9` → `1.9`
64-
- `release-1.8` → `1.8`
61+
Select the image repo and tag based on the release branch:
62+
- `main` → `-r rhdh-community/rhdh -t next`
63+
- `release-1.9` → `-r rhdh/rhdh-hub-rhel9 -t 1.9`
64+
- `release-1.8` → `-r rhdh/rhdh-hub-rhel9 -t 1.8`
6565

6666
After deployment completes, set up the local test environment:
6767
```bash

‎.cursor/rules/e2e-fix-workflow.mdc‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -80,23 +80,19 @@ Build logs and JUnit XML results are in the GCS artifacts directory. Look for Pl
8080

8181
#### Job Name → local-run.sh `-j` Parameter
8282

83-
| CI job pattern | local-run.sh job name |
84-
|----------------|----------------------|
85-
| `*ocp*helm*nightly*` | `nightly-ocp-helm` |
86-
| `*ocp*operator*nightly*` | `nightly-ocp-operator` |
87-
| `*ocp*operator*auth-providers*` | `nightly-ocp-operator-auth-providers` |
88-
| `*aks*helm*` | `nightly-aks-helm` |
89-
| `*eks*helm*` | `nightly-eks-helm` |
90-
| `*gke*helm*` | `nightly-gke-helm` |
91-
| `*pull*ocp*helm*` | `pull-ocp-helm` |
92-
93-
#### Release Branch → Image Tag
94-
95-
| Branch | Image tag |
96-
|--------|-----------|
97-
| `main` | `next` |
98-
| `release-1.9` | `1.9` |
99-
| `release-1.8` | `1.8` |
83+
Use the **full Prow CI job name** directly as the `-j` parameter. The `openshift-ci-tests.sh` handler uses bash glob patterns (like `*ocp*helm*nightly*`) to match the job name, so the full name works correctly.
84+
85+
**Example**: `./local-run.sh -j periodic-ci-redhat-developer-rhdh-main-e2e-ocp-v4-20-helm-nightly -r rhdh-community/rhdh -t next -s`
86+
87+
Do NOT use shortened names like `nightly-ocp-helm` — these do not match the glob patterns.
88+
89+
#### Release Branch → Image Repo and Tag
90+
91+
| Branch | `-r` (image repo) | `-t` (image tag) |
92+
|--------|-------------------|-------------------|
93+
| `main` | `rhdh-community/rhdh` | `next` |
94+
| `release-1.9` | `rhdh/rhdh-hub-rhel9` | `1.9` |
95+
| `release-1.8` | `rhdh/rhdh-hub-rhel9` | `1.8` |
10096

10197
## Branch and Deployment Setup
10298

@@ -111,9 +107,11 @@ git checkout -b fix/e2e-<description> upstream/<release-branch>
111107

112108
### Deployment via local-run.sh
113109

110+
CLI mode requires **all three** flags (`-j`, `-r`, `-t`). Without `-r`, the script enters interactive mode.
111+
114112
```bash
115113
cd e2e-tests
116-
./local-run.sh -j <job-name> -t <image-tag> -s # -s = deploy only, skip tests
114+
./local-run.sh -j <full-prow-job-name> -r <image-repo> -t <image-tag> -s # -s = deploy only, skip tests
117115
```
118116

119117
Prerequisites: `podman` (machine with 8GB RAM, 4 CPUs), `oc`, `vault`, `jq`, `curl`, `rsync`, `bc`.

‎.cursor/skills/deploy-rhdh/SKILL.md‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -49,38 +49,37 @@ Vault authentication, cluster service account setup, RHDH deployment, and test e
4949

5050
### CLI Mode (Preferred)
5151

52+
CLI mode requires **all three** flags (`-j`, `-r`, `-t`) to avoid falling into interactive mode:
53+
5254
```bash
5355
cd e2e-tests
54-
./local-run.sh -j <job-name> [-t <image-tag>] [-s]
56+
./local-run.sh -j <full-prow-job-name> -r <image-repo> -t <image-tag> [-s]
5557
```
5658

5759
**Parameters:**
58-
- `-j / --job`: Job name (from `parse-ci-failure` output). Examples:
59-
- `nightly-ocp-helm` — OCP Helm deployment
60-
- `nightly-ocp-operator` — OCP Operator deployment
61-
- `nightly-aks-helm` — AKS Helm deployment
62-
- `pull-ocp-helm` — PR check deployment
63-
- `-t / --tag`: Image tag override (e.g., `1.9`, `next`, `1.9-123`)
60+
- `-j / --job`: The **full Prow CI job name** extracted from the Prow URL. The `openshift-ci-tests.sh` handler uses bash glob patterns (like `*ocp*helm*nightly*`) to match, so the full name works correctly. Example: `periodic-ci-redhat-developer-rhdh-main-e2e-ocp-v4-20-helm-nightly`
61+
- `-r / --repo`: Image repository (**required** for CLI mode — without it the script enters interactive mode)
62+
- `-t / --tag`: Image tag (e.g., `1.9`, `next`)
6463
- `-s / --skip-tests`: Deploy only, skip test execution (useful when you want to run tests manually afterward)
6564

66-
### Image Tag Selection
65+
Do NOT use shortened job names like `nightly-ocp-helm` for `-j` — these do not match the glob patterns in `openshift-ci-tests.sh`.
6766

68-
Match the image tag to the release branch:
67+
### Image Selection
6968

70-
| Release branch | Default image tag |
71-
|---------------|-------------------|
72-
| `main` | `next` (latest nightly from main) |
73-
| `release-1.9` | `1.9` (latest 1.9 nightly) |
74-
| `release-1.8` | `1.8` (latest 1.8 nightly) |
69+
Match the image repo and tag to the release branch:
7570

76-
The default image registry is `quay.io` and default repo is `rhdh/rhdh-hub-rhel9`.
71+
| Release branch | `-r` (image repo) | `-t` (image tag) |
72+
|---------------|-------------------|-------------------|
73+
| `main` | `rhdh-community/rhdh` | `next` |
74+
| `release-1.9` | `rhdh/rhdh-hub-rhel9` | `1.9` |
75+
| `release-1.8` | `rhdh/rhdh-hub-rhel9` | `1.8` |
7776

7877
### Deploy-Only Mode
7978

8079
For E2E fix work, deploy without running tests so you can run specific tests manually:
8180

8281
```bash
83-
./local-run.sh -j <job-name> -t <tag> -s
82+
./local-run.sh -j <full-prow-job-name> -r <image-repo> -t <tag> -s
8483
```
8584

8685
### What local-run.sh Does

‎.opencode/command/fix-e2e.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,19 +52,19 @@ If a Jira ticket was provided, include the ticket ID in the branch name:
5252

5353
**Skill**: `deploy-rhdh`
5454

55-
Deploy RHDH to a cluster using `e2e-tests/local-run.sh`:
55+
Deploy RHDH to a cluster using `e2e-tests/local-run.sh`. CLI mode requires **all three** flags (`-j`, `-r`, `-t`):
5656

5757
```bash
5858
cd e2e-tests
59-
./local-run.sh -j <job-name> -t <image-tag> -s
59+
./local-run.sh -j <full-prow-job-name> -r <image-repo> -t <image-tag> -s
6060
```
6161

62-
Use deploy-only mode (`-s`) to skip automated test execution — we'll run the specific failing test manually.
62+
Use deploy-only mode (`-s`) to skip automated test execution — we'll run the specific failing test manually. Use the **full Prow CI job name** for `-j` (not shortened names).
6363

64-
Select the image tag based on the release branch:
65-
- `main` → `next`
66-
- `release-1.9` → `1.9`
67-
- `release-1.8` → `1.8`
64+
Select the image repo and tag based on the release branch:
65+
- `main` → `-r rhdh-community/rhdh -t next`
66+
- `release-1.9` → `-r rhdh/rhdh-hub-rhel9 -t 1.9`
67+
- `release-1.8` → `-r rhdh/rhdh-hub-rhel9 -t 1.8`
6868

6969
After deployment completes, set up the local test environment:
7070
```bash

‎.opencode/memories/e2e-fix-workflow.md‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -77,23 +77,19 @@ Build logs and JUnit XML results are in the GCS artifacts directory. Look for Pl
7777

7878
#### Job Name → local-run.sh `-j` Parameter
7979

80-
| CI job pattern | local-run.sh job name |
81-
|----------------|----------------------|
82-
| `*ocp*helm*nightly*` | `nightly-ocp-helm` |
83-
| `*ocp*operator*nightly*` | `nightly-ocp-operator` |
84-
| `*ocp*operator*auth-providers*` | `nightly-ocp-operator-auth-providers` |
85-
| `*aks*helm*` | `nightly-aks-helm` |
86-
| `*eks*helm*` | `nightly-eks-helm` |
87-
| `*gke*helm*` | `nightly-gke-helm` |
88-
| `*pull*ocp*helm*` | `pull-ocp-helm` |
89-
90-
#### Release Branch → Image Tag
91-
92-
| Branch | Image tag |
93-
|--------|-----------|
94-
| `main` | `next` |
95-
| `release-1.9` | `1.9` |
96-
| `release-1.8` | `1.8` |
80+
Use the **full Prow CI job name** directly as the `-j` parameter. The `openshift-ci-tests.sh` handler uses bash glob patterns (like `*ocp*helm*nightly*`) to match the job name, so the full name works correctly.
81+
82+
**Example**: `./local-run.sh -j periodic-ci-redhat-developer-rhdh-main-e2e-ocp-v4-20-helm-nightly -r rhdh-community/rhdh -t next -s`
83+
84+
Do NOT use shortened names like `nightly-ocp-helm` — these do not match the glob patterns.
85+
86+
#### Release Branch → Image Repo and Tag
87+
88+
| Branch | `-r` (image repo) | `-t` (image tag) |
89+
|--------|-------------------|-------------------|
90+
| `main` | `rhdh-community/rhdh` | `next` |
91+
| `release-1.9` | `rhdh/rhdh-hub-rhel9` | `1.9` |
92+
| `release-1.8` | `rhdh/rhdh-hub-rhel9` | `1.8` |
9793

9894
## Branch and Deployment Setup
9995

@@ -108,9 +104,11 @@ git checkout -b fix/e2e-<description> upstream/<release-branch>
108104

109105
### Deployment via local-run.sh
110106

107+
CLI mode requires **all three** flags (`-j`, `-r`, `-t`). Without `-r`, the script enters interactive mode.
108+
111109
```bash
112110
cd e2e-tests
113-
./local-run.sh -j <job-name> -t <image-tag> -s # -s = deploy only, skip tests
111+
./local-run.sh -j <full-prow-job-name> -r <image-repo> -t <image-tag> -s # -s = deploy only, skip tests
114112
```
115113

116114
Prerequisites: `podman` (machine with 8GB RAM, 4 CPUs), `oc`, `vault`, `jq`, `curl`, `rsync`, `bc`.

‎.opencode/skill/deploy-rhdh/SKILL.md‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -51,38 +51,37 @@ Vault authentication, cluster service account setup, RHDH deployment, and test e
5151

5252
### CLI Mode (Preferred)
5353

54+
CLI mode requires **all three** flags (`-j`, `-r`, `-t`) to avoid falling into interactive mode:
55+
5456
```bash
5557
cd e2e-tests
56-
./local-run.sh -j <job-name> [-t <image-tag>] [-s]
58+
./local-run.sh -j <full-prow-job-name> -r <image-repo> -t <image-tag> [-s]
5759
```
5860

5961
**Parameters:**
60-
- `-j / --job`: Job name (from `parse-ci-failure` output). Examples:
61-
- `nightly-ocp-helm` — OCP Helm deployment
62-
- `nightly-ocp-operator` — OCP Operator deployment
63-
- `nightly-aks-helm` — AKS Helm deployment
64-
- `pull-ocp-helm` — PR check deployment
65-
- `-t / --tag`: Image tag override (e.g., `1.9`, `next`, `1.9-123`)
62+
- `-j / --job`: The **full Prow CI job name** extracted from the Prow URL. The `openshift-ci-tests.sh` handler uses bash glob patterns (like `*ocp*helm*nightly*`) to match, so the full name works correctly. Example: `periodic-ci-redhat-developer-rhdh-main-e2e-ocp-v4-20-helm-nightly`
63+
- `-r / --repo`: Image repository (**required** for CLI mode — without it the script enters interactive mode)
64+
- `-t / --tag`: Image tag (e.g., `1.9`, `next`)
6665
- `-s / --skip-tests`: Deploy only, skip test execution (useful when you want to run tests manually afterward)
6766

68-
### Image Tag Selection
67+
Do NOT use shortened job names like `nightly-ocp-helm` for `-j` — these do not match the glob patterns in `openshift-ci-tests.sh`.
6968

70-
Match the image tag to the release branch:
69+
### Image Selection
7170

72-
| Release branch | Default image tag |
73-
|---------------|-------------------|
74-
| `main` | `next` (latest nightly from main) |
75-
| `release-1.9` | `1.9` (latest 1.9 nightly) |
76-
| `release-1.8` | `1.8` (latest 1.8 nightly) |
71+
Match the image repo and tag to the release branch:
7772

78-
The default image registry is `quay.io` and default repo is `rhdh/rhdh-hub-rhel9`.
73+
| Release branch | `-r` (image repo) | `-t` (image tag) |
74+
|---------------|-------------------|-------------------|
75+
| `main` | `rhdh-community/rhdh` | `next` |
76+
| `release-1.9` | `rhdh/rhdh-hub-rhel9` | `1.9` |
77+
| `release-1.8` | `rhdh/rhdh-hub-rhel9` | `1.8` |
7978

8079
### Deploy-Only Mode
8180

8281
For E2E fix work, deploy without running tests so you can run specific tests manually:
8382

8483
```bash
85-
./local-run.sh -j <job-name> -t <tag> -s
84+
./local-run.sh -j <full-prow-job-name> -r <image-repo> -t <tag> -s
8685
```
8786

8887
### What local-run.sh Does

0 commit comments

Comments
 (0)