Skip to content

Commit a403871

Browse files
authored
Merge branch 'master' into docs-update-instructions
2 parents 3386a02 + f9b2d6d commit a403871

33 files changed

+408
-429
lines changed

.github/workflows/ci-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: Checkout code
18-
uses: actions/checkout@v5
18+
uses: actions/checkout@v6
1919

2020
- name: Install Go
2121
uses: actions/setup-go@v6
@@ -35,7 +35,7 @@ jobs:
3535
runs-on: ubuntu-latest
3636
steps:
3737
- name: Checkout code
38-
uses: actions/checkout@v5
38+
uses: actions/checkout@v6
3939

4040
- name: Install Go
4141
uses: actions/setup-go@v6

.github/workflows/ci-check-gomod.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ jobs:
1212
runs-on: ubuntu-24.04
1313
steps:
1414
- name: Checkout code
15-
uses: actions/checkout@v5
15+
uses: actions/checkout@v6
1616
- name: check
1717
uses: codeready-toolchain/toolchain-cicd/gomod-check@master

.github/workflows/govulncheck.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111

1212
steps:
1313
- name: Checkout code
14-
uses: actions/checkout@v5
14+
uses: actions/checkout@v6
1515

1616
- name: Run govulncheck
1717
uses: codeready-toolchain/toolchain-cicd/govulncheck-action@master

.github/workflows/publish-operators-for-e2e-tests.yml renamed to .github/workflows/publish-components-for-e2e-tests.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: publish-operators-for-e2e-tests
1+
name: publish-components-for-e2e-tests
22
on:
33
issue_comment:
44
types: [created]
@@ -13,7 +13,7 @@ env:
1313

1414
jobs:
1515
binary:
16-
name: Build & push operator bundles for e2e tests
16+
name: Build & push operator bundles & dashboard image for e2e tests
1717

1818
runs-on: ubuntu-24.04
1919
if: >-
@@ -25,7 +25,7 @@ jobs:
2525
steps:
2626
# Checkout from PR event
2727
- name: Checkout code from PR event
28-
uses: actions/checkout@v5
28+
uses: actions/checkout@v6
2929
if: ${{ github.event_name == 'pull_request_target' }}
3030
with:
3131
ref: ${{github.event.pull_request.head.ref}}
@@ -45,7 +45,7 @@ jobs:
4545
# Checkout the code based on the data retrieved from the previous step
4646
# Is executed only for comment events
4747
- name: Checkout code from PR
48-
uses: actions/checkout@v5
48+
uses: actions/checkout@v6
4949
if: ${{ github.event_name == 'issue_comment' }}
5050
with:
5151
repository: ${{ fromJson(steps.request.outputs.data).head.repo.full_name }}
@@ -58,7 +58,7 @@ jobs:
5858
go-version-file: go.mod
5959

6060
- name: Cache dependencies
61-
uses: actions/cache@v4
61+
uses: actions/cache@v5
6262
with:
6363
path: ~/go/pkg/mod
6464
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@@ -73,7 +73,8 @@ jobs:
7373
uses: codeready-toolchain/toolchain-cicd/prepare-tools-action@master
7474

7575
# Execute composite action using values from PR event
76-
- name: Publish current operator bundles for host & member based on PR event
76+
# Developer Sandbox Dashboard will be published too in this action
77+
- name: Publish current operator bundles & dashboard image based on PR event
7778
uses: codeready-toolchain/toolchain-cicd/publish-operators-for-e2e-tests@master
7879
if: ${{ github.event_name == 'pull_request_target' }}
7980
with:
@@ -85,7 +86,8 @@ jobs:
8586
gh-head-ref: ${{ github.event.pull_request.head.ref }}
8687

8788
# Execute composite action using values from PR event
88-
- name: Publish current operator bundles for host & member based on comment event
89+
# Developer Sandbox Dashboard will be published too in this action
90+
- name: Publish current operator bundles & dashboard image based on comment event
8991
uses: codeready-toolchain/toolchain-cicd/publish-operators-for-e2e-tests@master
9092
if: ${{ github.event_name == 'issue_comment' }}
9193
with:

.github/workflows/publish-sandbox-ui-for-ui-e2e-tests.yml

Lines changed: 0 additions & 97 deletions
This file was deleted.

.gitignore

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -339,10 +339,10 @@ $RECYCLE.BIN/
339339
# Windows shortcuts
340340
*.lnk
341341

342-
# custom .env file for Developer Sandbox UI E2E tests
343-
testsupport/sandbox-ui/.env
342+
# custom .env file for Developer Sandbox Dashboard E2E tests
343+
testsupport/devsandbox-dashboard/.env
344344

345-
# trace folder for Developer Sandbox UI E2E tests
345+
# trace folder for Developer Sandbox Dashboard E2E tests
346346
trace/
347347

348348
# End of https://www.gitignore.io/api/go,vim,git,macos,linux,emacs,windows,eclipse,intellij+all,visualstudiocode
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,4 +76,4 @@ RUN yum install -y \
7676
libX11-xcb && \
7777
yum clean all
7878

79-
CMD ["make", "test-ui-e2e"]
79+
CMD ["/bin/bash"]

deploy/sandbox-ui/base/deployment.yaml renamed to deploy/devsandbox-dashboard/base/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ kind: Deployment
22
apiVersion: apps/v1
33
metadata:
44
name: rhdh
5-
namespace: ${SANDBOX_UI_NS}
5+
namespace: ${DEVSANDBOX_DASHBOARD_NS}
66
labels:
77
app.kubernetes.io/instance: rhdh
88
spec:
File renamed without changes.

deploy/sandbox-ui/base/route.yaml renamed to deploy/devsandbox-dashboard/base/route.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ kind: Route
22
apiVersion: route.openshift.io/v1
33
metadata:
44
name: rhdh
5-
namespace: ${SANDBOX_UI_NS}
5+
namespace: ${DEVSANDBOX_DASHBOARD_NS}
66
labels:
77
app.kubernetes.io/instance: rhdh
88
spec:

0 commit comments

Comments
 (0)