Skip to content

Commit 4a6d212

Browse files
yehudit1987yehudit1987
committed
feat: Migrate JWA test-related workflows from kubeflow/kubeflow to notebooks-v1 branch #587
Signed-off-by: Yehudit Kerido <yehudit1987@gmail.com>
1 parent 290935a commit 4a6d212

File tree

12 files changed

+365
-4
lines changed

12 files changed

+365
-4
lines changed

‎.github/workflows/jwa_backend_unittests.yaml‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: JWA Backend Tests
2+
on:
3+
pull_request:
4+
paths:
5+
- components/crud-web-apps/jupyter/backend/**
6+
- releasing/version/VERSION
7+
branches:
8+
- master
9+
- notebooks-v1
10+
11+
jobs:
12+
run-backend-unittests:
13+
name: Unittests
14+
runs-on: ubuntu-22.04
15+
steps:
16+
- name: Checkout
17+
uses: actions/checkout@v4
18+
19+
- name: Install KinD
20+
run: ./components/testing/gh-actions/install_kind.sh
21+
22+
- name: Create KinD Cluster
23+
run: kind create cluster --config components/testing/gh-actions/kind-1-25.yaml
24+
25+
- uses: actions/setup-python@v5
26+
with:
27+
python-version: "3.7"
28+
29+
- name: Setup Python environment
30+
run: |
31+
cd components/crud-web-apps/jupyter/backend
32+
make install-deps
33+
34+
- name: Run unittests
35+
run: |
36+
cd components/crud-web-apps/jupyter/backend
37+
make unittest

‎.github/workflows/jwa_frontend_tests.yaml‎

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
name: JWA Frontend Tests
2+
on:
3+
pull_request:
4+
paths:
5+
- components/crud-web-apps/jupyter/frontend/**
6+
- releasing/version/VERSION
7+
branches:
8+
- master
9+
- notebooks-v1
10+
11+
jobs:
12+
frontend-format-linting-check:
13+
name: Check code format and lint
14+
runs-on: ubuntu-22.04
15+
16+
steps:
17+
- name: Check out code
18+
uses: actions/checkout@v4
19+
20+
- name: Setup Node
21+
uses: actions/setup-node@v4
22+
with:
23+
node-version: 16
24+
25+
- name: Check frontend formatting
26+
run: |
27+
cd components/crud-web-apps/jupyter/frontend
28+
npm i
29+
npm run format:check
30+
31+
- name: Check frontend code linting
32+
run: |
33+
cd components/crud-web-apps/jupyter/frontend
34+
npm i
35+
npm run lint-check
36+
37+
frontend-unit-tests:
38+
runs-on: ubuntu-22.04
39+
name: Unit tests
40+
steps:
41+
- name: Checkout
42+
uses: actions/checkout@v4
43+
44+
- name: Setup node version to 16
45+
uses: actions/setup-node@v4
46+
with:
47+
node-version: 16
48+
49+
- name: Install Kubeflow common library dependecies
50+
run: |
51+
cd components/crud-web-apps/common/frontend/kubeflow-common-lib
52+
npm i
53+
npm run build
54+
npm link ./dist/kubeflow
55+
56+
- name: Install JWA dependencies
57+
run: |
58+
cd components/crud-web-apps/jupyter/frontend
59+
npm i
60+
npm link kubeflow
61+
62+
- name: Run unit tests
63+
run: |
64+
cd components/crud-web-apps/jupyter/frontend
65+
npm run test:prod
66+
67+
run-ui-tests:
68+
name: UI tests with Playwright
69+
runs-on: ubuntu-22.04
70+
steps:
71+
- name: Checkout
72+
uses: actions/checkout@v4
73+
74+
- name: Setup node version to 16
75+
uses: actions/setup-node@v4
76+
with:
77+
node-version: 16
78+
79+
- name: Install Kubeflow common library dependecies
80+
run: |
81+
cd components/crud-web-apps/common/frontend/kubeflow-common-lib
82+
npm i
83+
npm run build
84+
npm link ./dist/kubeflow
85+
86+
- name: Install JWA dependencies
87+
run: |
88+
cd components/crud-web-apps/jupyter/frontend
89+
npm i
90+
npm link kubeflow
91+
92+
- name: Serve UI & run Playwright tests in Chrome and Firefox
93+
run: |
94+
cd components/crud-web-apps/jupyter/frontend
95+
npm run serve > serve.log 2>&1 & npx wait-on http://localhost:4200
96+
npx playwright install
97+
npm run ui-test-ci-all

‎.github/workflows/jwa_integration_test.yaml‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
name: JWA Integration Test
2+
on:
3+
pull_request:
4+
paths:
5+
- components/crud-web-apps/jupyter/**
6+
- components/crud-web-apps/common/**
7+
- releasing/version/VERSION
8+
branches:
9+
- master
10+
- notebooks-v1
11+
12+
concurrency:
13+
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event.number }}
14+
cancel-in-progress: true
15+
16+
env:
17+
IMG: ghcr.io/kubeflow/notebooks/jupyter-web-app
18+
TAG: integration-test
19+
20+
jobs:
21+
build:
22+
runs-on: ubuntu-22.04
23+
steps:
24+
- name: Checkout
25+
uses: actions/checkout@v4
26+
27+
- name: Setup Docker Buildx
28+
uses: docker/setup-buildx-action@v3
29+
30+
- name: Build JWA Image
31+
run: |
32+
cd components/crud-web-apps/jupyter
33+
make docker-build-multi-arch
34+
35+
- name: Install KinD
36+
run: ./components/testing/gh-actions/install_kind.sh
37+
38+
- name: Create KinD Cluster
39+
run: kind create cluster --config components/testing/gh-actions/kind-1-25.yaml
40+
41+
- name: Load Image into KinD Cluster
42+
run: |
43+
kind load docker-image "${IMG}:${TAG}"
44+
45+
- name: Install kustomize
46+
run: ./components/testing/gh-actions/install_kustomize.sh
47+
48+
- name: Install Istio
49+
run: ./components/testing/gh-actions/install_istio.sh
50+
51+
- name: Build & Apply manifests
52+
run: |
53+
cd components/crud-web-apps/jupyter/manifests
54+
kubectl create ns kubeflow
55+
56+
export CURRENT_IMAGE="${IMG}"
57+
export PR_IMAGE="${IMG}:${TAG}"
58+
59+
# escape "." in the image names, as it is a special characters in sed
60+
export CURRENT_IMAGE=$(echo "$CURRENT_IMAGE" | sed 's|\.|\\.|g')
61+
export PR_IMAGE=$(echo "$PR_IMAGE" | sed 's|\.|\\.|g')
62+
63+
kustomize build overlays/istio \
64+
| sed "s|${CURRENT_IMAGE}:[a-zA-Z0-9_.-]*|${PR_IMAGE}|g" \
65+
| kubectl apply -f -
66+
67+
kubectl wait pods -n kubeflow -l app=jupyter-web-app --for=condition=Ready --timeout=300s

‎.github/workflows/jwa_multi_arch_test.yaml‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
name: JWA Multi-Arch Build Test
2+
on:
3+
pull_request:
4+
paths:
5+
- components/crud-web-apps/jupyter/**
6+
- components/crud-web-apps/common/**
7+
- releasing/version/VERSION
8+
branches:
9+
- master
10+
- notebooks-v1
11+
12+
concurrency:
13+
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event.number }}
14+
cancel-in-progress: true
15+
16+
env:
17+
IMG: ghcr.io/kubeflow/notebooks/jupyter-web-app
18+
19+
jobs:
20+
build:
21+
runs-on: ubuntu-22.04
22+
steps:
23+
- name: Checkout
24+
uses: actions/checkout@v4
25+
26+
- name: Setup QEMU
27+
uses: docker/setup-qemu-action@v3
28+
29+
- name: Setup Docker Buildx
30+
uses: docker/setup-buildx-action@v3
31+
32+
- name: Build multi-arch Images (AMD64 & PPC64LE)
33+
timeout-minutes: 90
34+
run: |
35+
cd components/crud-web-apps/jupyter
36+
37+
echo "=== GitHub Actions Environment Debug ==="
38+
echo "IMG from env: ${{ env.IMG }}"
39+
echo "Current git commit: $(git rev-parse --short HEAD)"
40+
echo "Git describe output: $(git describe --tags --always --dirty)"
41+
echo "========================================"
42+
43+
echo "Starting linux/amd64 build..."
44+
ARCH=linux/amd64 make docker-build-multi-arch
45+
echo "Completed linux/amd64 build!"
46+
47+
echo "Starting linux/ppc64le build..."
48+
ARCH=linux/ppc64le make docker-build-multi-arch
49+
echo "Completed linux/ppc64le build!"
50+
51+
- name: Build ARM64 Image (Optional)
52+
timeout-minutes: 60
53+
continue-on-error: true
54+
run: |
55+
cd components/crud-web-apps/jupyter
56+
57+
echo "Starting linux/arm64/v8 build..."
58+
ARCH=linux/arm64/v8 make docker-build-multi-arch
59+
echo "Completed linux/arm64/v8 build!"
60+
61+
- name: Verify multi-arch builds
62+
run: |
63+
echo "Verifying multi-arch build results:"
64+
echo "Listing Docker images:"
65+
docker images | grep jupyter-web-app || echo "No jupyter-web-app images found"
66+
67+
echo ""
68+
echo "Build summary:"
69+
echo "✅ AMD64 & PPC64LE builds completed in main step"
70+
echo "ℹ️ ARM64 build attempted in optional step (may timeout)"
71+
72+
echo ""
73+
echo "Total images built:"
74+
docker images --format "table {{.Repository}}\t{{.Tag}}\t{{.Size}}" | grep jupyter-web-app | wc -l

‎components/crud-web-apps/jupyter/Makefile‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
IMG ?= ghcr.io/kubeflow/kubeflow/jupyter-web-app
1+
IMG ?= ghcr.io/kubeflow/notebooks/jupyter-web-app
22
TAG ?= $(shell git describe --tags --always --dirty)
33
DOCKERFILE ?= jupyter/Dockerfile
44
ARCH ?= linux/amd64
@@ -12,8 +12,25 @@ docker-push:
1212

1313
.PHONY: docker-build-multi-arch
1414
docker-build-multi-arch: ## Build multi-arch docker images with docker buildx
15+
@echo "=== Docker Build Multi-Arch Debug Info ==="
16+
@echo "IMG: ${IMG}"
17+
@echo "TAG: ${TAG}"
18+
@echo "ARCH: ${ARCH}"
19+
@echo "DOCKERFILE: ${DOCKERFILE}"
20+
@echo "Full image name will be: ${IMG}:${TAG}"
21+
@echo "Platform: ${ARCH}"
22+
@echo "=========================================="
1523
cd ../ && docker buildx build --load --platform ${ARCH} --tag ${IMG}:${TAG} -f ${DOCKERFILE} .
1624

25+
.PHONY: docker-build-multi-arch-test
26+
docker-build-multi-arch-test: ## Build multi-arch docker images for testing (export to tar)
27+
@echo "Building with IMG=${IMG}, ARCH=${ARCH}, TAG=${TAG}"
28+
$(eval IMG_NAME := $(shell basename ${IMG}))
29+
$(eval ARCH_SAFE := $(shell echo ${ARCH} | sed 's|/|-|g'))
30+
@echo "Output file will be: /tmp/${IMG_NAME}-${ARCH_SAFE}.tar"
31+
cd ../ && docker buildx build --platform ${ARCH} --tag ${IMG}:${TAG} -f ${DOCKERFILE} --output type=tar,dest=/tmp/${IMG_NAME}-${ARCH_SAFE}.tar .
32+
33+
1734

1835
.PHONY: docker-build-push-multi-arch
1936
docker-build-push-multi-arch: ## Build multi-arch docker images with docker buildx and push to docker registry

‎components/crud-web-apps/jupyter/manifests/base/deployment.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ spec:
88
spec:
99
containers:
1010
- name: jupyter-web-app
11-
image: ghcr.io/kubeflow/kubeflow/jupyter-web-app
11+
image: ghcr.io/kubeflow/notebooks/jupyter-web-app
1212
ports:
1313
- containerPort: 5000
1414
volumeMounts:

‎components/crud-web-apps/jupyter/manifests/base/kustomization.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ commonLabels:
2121
app: jupyter-web-app
2222
kustomize.component: jupyter-web-app
2323
images:
24-
- name: ghcr.io/kubeflow/kubeflow/jupyter-web-app
25-
newName: ghcr.io/kubeflow/kubeflow/jupyter-web-app
24+
- name: ghcr.io/kubeflow/notebooks/jupyter-web-app
25+
newName: ghcr.io/kubeflow/notebooks/jupyter-web-app
2626
newTag: latest
2727
# We need the name to be unique without the suffix because the original name is what
2828
# gets used with patches

‎components/testing/gh-actions/install_istio.sh‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#!/bin/bash
2+
3+
set -euo pipefail
4+
5+
ISTIO_VERSION="1.17.8"
6+
ISTIO_URL="https://istio.io/downloadIstio"
7+
8+
echo "Installing Istio ${ISTIO_VERSION} ..."
9+
mkdir istio_tmp
10+
pushd istio_tmp >/dev/null
11+
curl -sL "$ISTIO_URL" | ISTIO_VERSION=${ISTIO_VERSION} sh -
12+
cd istio-${ISTIO_VERSION}
13+
export PATH=$PWD/bin:$PATH
14+
istioctl install -y
15+
popd

‎components/testing/gh-actions/install_kind.sh‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#!/bin/bash
2+
3+
set -euo pipefail
4+
5+
KIND_VERSION="0.22.0"
6+
KIND_URL="https://kind.sigs.k8s.io/dl/v${KIND_VERSION}/kind-linux-amd64"
7+
8+
echo "Setting up kind environment..."
9+
sudo swapoff -a
10+
sudo rm -f /swapfile
11+
sudo mkdir -p /tmp/etcd
12+
sudo mount -t tmpfs tmpfs /tmp/etcd
13+
14+
echo "Installing kind ${KIND_VERSION} ..."
15+
curl -sL -o kind "$KIND_URL"
16+
chmod +x ./kind
17+
sudo mv kind /usr/local/bin

‎components/testing/gh-actions/install_kustomize.sh‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/bin/bash
2+
3+
set -euo pipefail
4+
5+
KUSTOMIZE_VERSION="5.4.1"
6+
KUSTOMIZE_URL="https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize/v${KUSTOMIZE_VERSION}/kustomize_v${KUSTOMIZE_VERSION}_linux_amd64.tar.gz"
7+
8+
echo "Installing kustomize ${KUSTOMIZE_VERSION} ..."
9+
curl -sL -o kustomize.tar.gz "$KUSTOMIZE_URL"
10+
tar -xzf kustomize.tar.gz
11+
chmod +x kustomize
12+
sudo mv kustomize /usr/local/bin

0 commit comments

Comments
 (0)