Skip to content

Commit 529aefb

Browse files
committed
Use minikube setup script for system tests
Signed-off-by: Michael Edgar <medgar@redhat.com>
1 parent 23a15e1 commit 529aefb

1 file changed

Lines changed: 32 additions & 37 deletions

File tree

.github/workflows/systemtests.yml

Lines changed: 32 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,13 @@ jobs:
5656
id: generate-matrix
5757
run: ./.github/actions/systemtests/generate-test-matrix.sh
5858

59-
6059
# Run single or matrix of ST jobs
6160
run-systemtests:
6261
needs: generate-matrix
6362
strategy:
6463
fail-fast: false
6564
matrix: ${{ fromJson(needs.generate-matrix.outputs.matrix) }}
66-
max-parallel: 2
65+
#max-parallel: 2
6766
permissions:
6867
contents: read
6968
statuses: write
@@ -88,28 +87,33 @@ jobs:
8887
with:
8988
ref: ${{ env.COMMIT_SHA }}
9089

91-
- name: Download Image Artifacts
92-
uses: actions/download-artifact@v8
93-
with:
94-
name: streamshub-images
95-
run-id: ${{ env.ARTIFACTS_RUN_ID }}
96-
repository: ${{ env.REPO }}
97-
github-token: ${{ env.GH_TOKEN }}
98-
path: .
99-
100-
- name: Setup Minikube
101-
id: setup_minikube
102-
uses: ./.github/actions/setup-minikube
90+
- name: Set Up JDK
91+
uses: actions/setup-java@v5
10392
with:
104-
MEM: 15g
105-
CPUS: 4
93+
java-version: '21'
94+
distribution: 'temurin'
10695

107-
- name: Cache Maven packages
96+
- name: Cache Maven Packages
10897
uses: actions/cache@v6
10998
with:
110-
path: ~/.m2
111-
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
112-
restore-keys: ${{ runner.os }}-m2
99+
path: ~/.m2/repository
100+
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
101+
restore-keys: |
102+
${{ runner.os }}-maven-
103+
104+
- name: Fetch Operator Framework Utilities
105+
run: ./operator/bin/fetch-operator-utilities.sh
106+
107+
- name: Setup Minikube Environment
108+
run: |
109+
# Needed for skopeo in setup-minikube.sh script
110+
sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0
111+
112+
# Needed to copy locally built images to minikube registry
113+
sudo apt-get install -y socat
114+
115+
# Execute the setup
116+
MINIKUBE_CPU_COUNT=4 MINIKUBE_MEMORY=15g MINIKUBE_DRIVER=docker ./systemtests/scripts/setup-minikube.sh
113117
114118
- name: Set Dynamic Environment Vars
115119
run: |
@@ -122,16 +126,13 @@ jobs:
122126
set -x
123127
echo "Preparing YAML-based installation..."
124128
125-
gh run download ${{ env.ARTIFACTS_RUN_ID }} --repo ${{ env.REPO }} -n k8s-resources --dir ./k8s-resources
126-
127-
mkdir -p ./k8s-resources/merged
128-
cat ./k8s-resources/kubernetes/consoles.console.streamshub.github.com-v1.yml \
129-
./k8s-resources/kubernetes/kubernetes.yml \
130-
> ./k8s-resources/merged/streamshub-console-operator.yaml
129+
cat ./operator/target/kubernetes/consoles.console.streamshub.github.com-v1.yml \
130+
./operator/target/kubernetes/kubernetes.yml \
131+
> ./target/streamshub-console-operator.yaml
131132
132133
# Export as environment variable
133134
echo "CONSOLE_INSTALL_TYPE=yaml" >> $GITHUB_ENV
134-
CONSOLE_OPERATOR_BUNDLE_URL=$(realpath ./k8s-resources/merged/streamshub-console-operator.yaml)
135+
CONSOLE_OPERATOR_BUNDLE_URL=$(realpath ./target/streamshub-console-operator.yaml)
135136
echo "CONSOLE_OPERATOR_BUNDLE_URL=$CONSOLE_OPERATOR_BUNDLE_URL" >> $GITHUB_ENV
136137
137138
echo "YAML operator manifest created at: $CONSOLE_OPERATOR_BUNDLE_URL"
@@ -160,25 +161,19 @@ jobs:
160161
with:
161162
node-version: lts/*
162163
- run: |
163-
npm install -g playwright
164-
npx playwright install --with-deps
165-
166-
- name: Setup JDK
167-
uses: actions/setup-java@v5
168-
with:
169-
java-version: '21'
170-
distribution: 'temurin'
164+
npm install -g playwright --ignore-scripts
165+
npx --ignore-scripts playwright install --with-deps
171166
172167
- name: Build project
173168
run: |
174-
mvn clean install -B -DskipTests --no-transfer-progress
169+
mvn install -B -DskipTests --no-transfer-progress
175170
176171
- name: Prepare systemtest ENV
177172
run: ./.github/actions/systemtests/prepare-systemtests-env.sh
178173

179174
- name: Run systemtests
180175
run: |
181-
mvn clean verify -B --no-transfer-progress -pl systemtests $PARAMETERS
176+
mvn verify -B --no-transfer-progress -pl systemtests $PARAMETERS
182177
183178
- name: Archive systemtest artifacts
184179
uses: actions/upload-artifact@v7

0 commit comments

Comments
 (0)