fix(ci): use new infra configuration

apache · Aug 14, 2024 · b54348f · b54348f
1 parent bff152c
commit b54348f
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 37 deletions.
diff --git a/.github/actions/release-nightly/action.yml b/.github/actions/release-nightly/action.yml
@@ -42,42 +42,6 @@ runs:
 
   steps:
 
-    - name: Set up JDK ${{ inputs.javaVersion }}
-      uses: actions/setup-java@v4
-      with:
-        java-version: ${{ inputs.javaVersion }}
-        distribution: "temurin"
-
-    - name: Install Go ${{ inputs.goVersionFile }}
-      uses: actions/setup-go@v5
-      with:
-        go-version-file: ${{ inputs.goVersionFile }}
-        check-latest: true
-
-    - name: Common smoke tests
-      uses: ./.github/actions/e2e-common
-      with:
-        cluster-config-data: ${{ inputs.secretE2ECluster }}
-        cluster-kube-config-data: ${{ inputs.secretE2EKube }}
-        smoke-test-only: true
-
-    - name: Get nightly version and update date
-      shell: bash
-      run: |
-        V="$(make get-version | sed s/-SNAPSHOT//)-nightly"
-        D=$(date)
-        echo "VERSION=$V" >> $GITHUB_ENV
-        echo "UPD_DATE=$D" >> $GITHUB_ENV
-
-    - name: Global Env
-      shell: bash
-      run: |
-        echo "Using VERSION=${{ env.VERSION }}"
-
-        IMAGE_NAME=docker.io/${TEST_DOCKER_HUB_USERNAME:-testcamelk}/camel-k
-        echo "Using IMAGE_NAME=$IMAGE_NAME"
-        echo "IMAGE_NAME=$IMAGE_NAME" >> $GITHUB_ENV
-
     - name: Install newer docker CLI supporting multi platform build
       shell: bash
       run: |
@@ -96,6 +60,32 @@ runs:
     - name: Set up QEMU (required by multi platform build)
       uses: docker/setup-qemu-action@v3
 
+    - name: Infra setting
+      uses: ./.github/actions/infra-setting
+
+    - name: Install operator
+      shell: bash
+      run: |
+        kubectl create ns camel-k
+        make install-k8s-global
+        kubectl wait --for=jsonpath='{.status.phase}'=Ready itp camel-k -n camel-k --timeout=60s
+
+    - name: Run test
+      shell: bash
+      run: |
+        DO_TEST_PREBUILD=false GOTESTFMT="-json 2>&1 | gotestfmt" make test-common
+
+    - name: Get nightly version and update date
+      shell: bash
+      run: |
+        V="$(make get-version | sed s/-SNAPSHOT//)-nightly"
+        D=$(date)
+        echo "VERSION=$V" >> $GITHUB_ENV
+        echo "UPD_DATE=$D" >> $GITHUB_ENV
+        IMAGE_NAME=docker.io/${TEST_DOCKER_HUB_USERNAME:-testcamelk}/camel-k
+        echo "Using IMAGE_NAME=$IMAGE_NAME"
+        echo "IMAGE_NAME=$IMAGE_NAME" >> $GITHUB_ENV
+
     - name: Login to staging container registry
       uses: docker/login-action@v3
       with:

diff --git a/.github/workflows/nightly-release.yml b/.github/workflows/nightly-release.yml
@@ -38,7 +38,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ref-branch: [main, release-2.3.x, release-2.4.x]
+        ref-branch: [main, release-2.4.x]
 
     if: github.repository == 'apache/camel-k'
     runs-on: ubuntu-latest