wip

vaadin · Feb 6, 2025 · 51ae586 · 51ae586
1 parent d5503c2
commit 51ae586
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 10 deletions.
diff --git a/.github/workflows/pit.yml b/.github/workflows/pit.yml
@@ -37,12 +37,6 @@ jobs:
     steps:
       - name: Check out branch
         uses: actions/checkout@v4
-      - if: ${{ env.ACT }}
-        name: ACT - install dependencies
-        run: |
-          echo "export PATH='$PATH'" > path.sh
-          apt-get update
-          apt-get install -y vim iputils-ping sudo unzip wget jq curl
       - uses: actions/setup-node@v4
         with:
           node-version: '18'
@@ -58,13 +52,24 @@ jobs:
       - name: Create k8s Kind Cluster
         uses: helm/kind-action@v1
         with:
-          install_only: false
+          cluster_name: cc-cluster
+      - if: ${{ env.ACT }}
+        name: ACT - install dependencies
+        run: |
+          for i in PATH CC_KEY CC_CERT GHTK
+          do
+             H=`eval 'echo $'$i`
+             echo "export $i='"$H"'" >> vars.sh
+          done
+          apt-get update
+          apt-get install -y vim iputils-ping sudo unzip wget jq curl
       - name: Run PiT
         env:
           CC_KEY: ${{ secrets.CC_KEY }}
           CC_CERT: ${{ secrets.CC_CERT }}
           GHTK: ${{ secrets.GHTK }}
         run: |
+          # Run PiT script with parameters given in inputs
           [ -n "${{ inputs.skipcurrent }}" ] && A="$A --skip-current"
           [ -n "${{ inputs.skipdev }}" ] && A="$A --skip-dev"
           [ -n "${{ inputs.debug }}" ] && A="$A --debug"

diff --git a/scripts/pit/lib/lib-ccenter.sh b/scripts/pit/lib/lib-ccenter.sh
@@ -179,6 +179,10 @@ buildCC() {
   runCmd "$TEST" "Compiling CC" "'$MVN' $D -ntp -B -pl :control-center-app -Pproduction -DskipTests -am install" || return 1
   runCmd "$TEST" "Creating CC application docker image" "'$MVN' $D -ntp -B -pl :control-center-app -Pproduction -Ddocker.tag=local docker:build" || return 1
   runCmd "$TEST" "Creating CC keycloack docker image" "'$MVN' $D -ntp -B -pl :control-center-keycloak package -Ddocker.tag=local docker:build" || return 1
+  if [ "$CLUSTER" = "$KIND_CLUSTER" ]; then
+      runCmd "$TEST" "Load docker image control-center-app for Kind" kind load docker-image vaadin/control-center-app:local
+      runCmd "$TEST" "Load docker image control-center-keycloak for Kind " kind load docker-image vaadin/control-center-keycloak:local
+  fi
   runCmd "$TEST" "Update helm dependencies" helm dependency build charts/control-center
 }
 
@@ -233,11 +237,11 @@ runControlCenter() {
 validateControlCenter() {
   checkCommands docker kubectl helm unzip || return 1
   checkDockerRunning || return 1
-  if [ -z "$NOCURRENT" ]; then
-    runControlCenter current
-  fi
   buildCC || return 1
   runControlCenter next
+  # if [ -z "$NOCURRENT" ]; then
+  #   runControlCenter current
+  # fi
 }