Skip to content

Commit 51ae586

Browse files
committed
wip
1 parent d5503c2 commit 51ae586

File tree

2 files changed

+19
-10
lines changed

2 files changed

+19
-10
lines changed

.github/workflows/pit.yml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,6 @@ jobs:
3737
steps:
3838
- name: Check out branch
3939
uses: actions/checkout@v4
40-
- if: ${{ env.ACT }}
41-
name: ACT - install dependencies
42-
run: |
43-
echo "export PATH='$PATH'" > path.sh
44-
apt-get update
45-
apt-get install -y vim iputils-ping sudo unzip wget jq curl
4640
- uses: actions/setup-node@v4
4741
with:
4842
node-version: '18'
@@ -58,13 +52,24 @@ jobs:
5852
- name: Create k8s Kind Cluster
5953
uses: helm/kind-action@v1
6054
with:
61-
install_only: false
55+
cluster_name: cc-cluster
56+
- if: ${{ env.ACT }}
57+
name: ACT - install dependencies
58+
run: |
59+
for i in PATH CC_KEY CC_CERT GHTK
60+
do
61+
H=`eval 'echo $'$i`
62+
echo "export $i='"$H"'" >> vars.sh
63+
done
64+
apt-get update
65+
apt-get install -y vim iputils-ping sudo unzip wget jq curl
6266
- name: Run PiT
6367
env:
6468
CC_KEY: ${{ secrets.CC_KEY }}
6569
CC_CERT: ${{ secrets.CC_CERT }}
6670
GHTK: ${{ secrets.GHTK }}
6771
run: |
72+
# Run PiT script with parameters given in inputs
6873
[ -n "${{ inputs.skipcurrent }}" ] && A="$A --skip-current"
6974
[ -n "${{ inputs.skipdev }}" ] && A="$A --skip-dev"
7075
[ -n "${{ inputs.debug }}" ] && A="$A --debug"

scripts/pit/lib/lib-ccenter.sh

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,10 @@ buildCC() {
179179
runCmd "$TEST" "Compiling CC" "'$MVN' $D -ntp -B -pl :control-center-app -Pproduction -DskipTests -am install" || return 1
180180
runCmd "$TEST" "Creating CC application docker image" "'$MVN' $D -ntp -B -pl :control-center-app -Pproduction -Ddocker.tag=local docker:build" || return 1
181181
runCmd "$TEST" "Creating CC keycloack docker image" "'$MVN' $D -ntp -B -pl :control-center-keycloak package -Ddocker.tag=local docker:build" || return 1
182+
if [ "$CLUSTER" = "$KIND_CLUSTER" ]; then
183+
runCmd "$TEST" "Load docker image control-center-app for Kind" kind load docker-image vaadin/control-center-app:local
184+
runCmd "$TEST" "Load docker image control-center-keycloak for Kind " kind load docker-image vaadin/control-center-keycloak:local
185+
fi
182186
runCmd "$TEST" "Update helm dependencies" helm dependency build charts/control-center
183187
}
184188

@@ -233,11 +237,11 @@ runControlCenter() {
233237
validateControlCenter() {
234238
checkCommands docker kubectl helm unzip || return 1
235239
checkDockerRunning || return 1
236-
if [ -z "$NOCURRENT" ]; then
237-
runControlCenter current
238-
fi
239240
buildCC || return 1
240241
runControlCenter next
242+
# if [ -z "$NOCURRENT" ]; then
243+
# runControlCenter current
244+
# fi
241245
}
242246

243247

0 commit comments

Comments
 (0)