Merge remote-tracking branch 'origin/master' into qase-test-upload

k3s-io · Jul 16, 2024 · c2094f4 · c2094f4
2 parents e69e88f + 59d85e2
commit c2094f4
Show file tree

Hide file tree

Showing 56 changed files with 904 additions and 380 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -36,8 +36,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # TODO fix embeddedmirror and add it to the matrix
-        etest: [startup, s3, btrfs, externalip, privateregistry, wasm]
+        etest: [startup, s3, btrfs, externalip, privateregistry, embeddedmirror, wasm]
       max-parallel: 3
     steps:
       - name: "Checkout"
@@ -116,4 +115,4 @@ jobs:
         chmod +x ./dist/artifacts/k3s
         . ./tests/docker/test-helpers
         . ./tests/docker/test-run-${{ matrix.dtest }}
-        echo "Did test-run-${{ matrix.dtest }} pass $?"
+        echo "Did test-run-${{ matrix.dtest }} pass $?"
diff --git a/.github/workflows/nightly-install.yaml b/.github/workflows/nightly-install.yaml
@@ -1,9 +1,11 @@
 name: Nightly Install
 on:
-  push: {}
+  push:
+    branches:
+      - []
 #  schedule:
 #    - cron: "0 0 * * 1-5"
-#  workflow_dispatch: {}
+  workflow_dispatch: {}
 
 permissions:
   contents: read
@@ -19,122 +21,200 @@ jobs:
         channel: [stable, latest]
         vm: [rocky-8, fedora, opensuse-leap, ubuntu-2204]
       max-parallel: 4
-#    defaults:
-#      run:
-#        working-directory: tests/install/${{ matrix.vm }}
+    defaults:
+      run:
+        working-directory: tests/install/${{ matrix.vm }}
     env:
       INSTALL_K3S_CHANNEL: ${{ matrix.channel }}
+      LOG_FILE: /tmp/k3s-install-test-results.log
     steps:
       - name: "Checkout"
         uses: actions/checkout@v4
         with: {fetch-depth: 1}
-#      - name: Set up vagrant and libvirt
-#        uses: ./.github/actions/vagrant-setup
-#      - name: "Vagrant Cache"
-#        uses: actions/cache@v4
-#        with:
-#          path: |
-#             ~/.vagrant.d/boxes
-#          key: vagrant-box-${{ matrix.vm }}
-#        id: vagrant-cache
-#      - name: "Vagrant Plugin(s)"
-#        run: vagrant plugin install vagrant-k3s vagrant-reload
-#      - name: "Vagrant Up ⏩ Install K3s"
-#        run: vagrant up
-#      - name: "⏳ Node"
-#        run: vagrant provision --provision-with=k3s-wait-for-node
-#      - name: "⏳ CoreDNS"
-#        run: vagrant provision --provision-with=k3s-wait-for-coredns
-#      - name: "⏳ Local Storage"
-#        run: vagrant provision --provision-with=k3s-wait-for-local-storage
-#        continue-on-error: true
-#      - name: "⏳ Metrics Server"
-#        run: vagrant provision --provision-with=k3s-wait-for-metrics-server
-#        continue-on-error: true
-#      - name: "⏳ Traefik"
-#        run: vagrant provision --provision-with=k3s-wait-for-traefik
-#        continue-on-error: true
-#      - name: "k3s-status"
-#        run: vagrant provision --provision-with=k3s-status
-#      - name: "k3s-procps"
-#        run: vagrant provision --provision-with=k3s-procps
+      - name: Set up vagrant and libvirt
+        uses: ./.github/actions/vagrant-setup
+      - name: "Vagrant Cache"
+        uses: actions/cache@v4
+        with:
+          path: |
+             ~/.vagrant.d/boxes
+          key: vagrant-box-${{ matrix.vm }}
+        id: vagrant-cache
+      - name: "Vagrant Plugin(s)"
+        run: vagrant plugin install vagrant-k3s vagrant-reload
+      - name: "Vagrant Up ⏩ Install K3s"
+        run: |
+          if vagrant up; then
+            echo "Vagrant Up ⏩ Install K3s: success" | tee -a ${{ env.LOG_FILE }}
+          else
+            echo "Vagrant Up ⏩ Install K3s: failure" | tee -a ${{ env.LOG_FILE }}
+            exit 1
+          fi
+      - name: "⏳ Node"
+        run: |
+          if vagrant provision --provision-with=k3s-wait-for-node; then
+            echo "Node provision: success" | tee -a ${{ env.LOG_FILE }} 
+          else
+            echo "Node provision: failure" | tee -a ${{ env.LOG_FILE }}
+            exit 1
+          fi
+      - name: "⏳ CoreDNS"
+        run: |
+          if vagrant provision --provision-with=k3s-wait-for-coredns; then
+            echo "CoreDNS provision: success" | tee -a ${{ env.LOG_FILE }}  
+          else
+            echo "CoreDNS provision: failure" | tee -a ${{ env.LOG_FILE }}
+            exit 1
+          fi
+      - name: "⏳ Local Storage"
+        run: |
+          vagrant provision --provision-with=k3s-wait-for-local-storage && \
+          echo "Local Storage provision: success" | tee -a ${{ env.LOG_FILE }} || \
+          echo "Local Storage provision: failure" | tee -a ${{ env.LOG_FILE }}
+        continue-on-error: true
+      - name: "⏳ Metrics Server"
+        run: |
+          vagrant provision --provision-with=k3s-wait-for-metrics-server && \
+          echo "Metrics Server provision: success" | tee -a ${{ env.LOG_FILE }} || \
+          echo "Metrics Server provision: failure" | tee -a ${{ env.LOG_FILE }}
+        continue-on-error: true
+      - name: "⏳ Traefik"
+        run: |
+          vagrant provision --provision-with=k3s-wait-for-traefik && \
+          echo "Traefik provision: success" | tee -a ${{ env.LOG_FILE }} || \
+          echo "Traefik provision: failure" | tee -a ${{ env.LOG_FILE }}
+        continue-on-error: true
+      - name: "k3s-status"
+        run: |
+          if vagrant provision --provision-with=k3s-status; then
+            echo "k3s-status: success" | tee -a ${{ env.LOG_FILE }}  
+          else
+            echo "k3s-status: failure" | tee -a ${{ env.LOG_FILE }}
+            exit 1
+          fi
+      - name: "k3s-procps"
+        run: |
+          if vagrant provision --provision-with=k3s-procps; then
+            echo "k3s-procps: success" | tee -a ${{ env.LOG_FILE }}
+          else
+            echo "k3s-procps: failure" | tee -a ${{ env.LOG_FILE }}
+            exit 1
+          fi
 
-      - name: Create Qase Run
-        id: qase
+      - name: "Qase Results environment setup"
+        if: always()
         env:
+          QASE_RUN_NAME: "K3s Nightly Install-${{ matrix.vm }}(${{ matrix.channel }})"
           QASE_API_TOKEN: ${{ secrets.QASE_API_TOKEN }}
+          PROJECT_CODE: "K3SRKE2"
+          CASE_ID_LIST: "108,109,110,111,112,113,114,115"
         run: |
-          sudo apt-get install jq
-          # create a QASE_RUN_NAME DINAMICALLY
-          QASE_RUN_NAME="Install K3s on ${{ matrix.vm }}"
-          
-          # create a run ID
-          RESPONSE=$(curl --request POST \
-          --url https://api.qase.io/v1/run/DEMO \
-          --header 'Token: $QASE_API_TOKEN' \
-          --header 'accept: application/json' \
-          --header 'content-type: application/json' \
-          --data '
-            {
-              "cases": [
-                          0,
-                          1
-                       ],
-              "is_autotest": true,
-              "title": "'"$QASE_RUN_NAME"'",
-            }'
-            )
-          
-            # set the run ID as an output variable
-            RUN_ID=$(echo $RESPONSE | jq -r '.result.id')
-          
-            # Print the RUN_ID to verify
-            echo "The RUN_ID is: $RUN_ID"
-            
-            # Set the run ID as an output variable using the environment file
-              echo "QASE_RUN_ID=$RUN_ID" >> $GITHUB_ENV
+          echo "QASE_RUN_NAME=${{ env.QASE_RUN_NAME }}" >> $GITHUB_ENV
+          echo "PROJECT_CODE=${{ env.PROJECT_CODE }}" >> $GITHUB_ENV
+          echo "CASE_ID_LIST=${{ env.CASE_ID_LIST }}" >> $GITHUB_ENV
+
+      - name: "Create Qase Run"
+        if: always()
+        id: create-qase-run
+        env:
+          QASE_RUN_NAME:  ${{ env.QASE_RUN_NAME }}
+          CASE_ID_LIST:  ${{ env.CASE_ID_LIST }}
+          QASE_API_TOKEN: ${{ secrets.QASE_API_TOKEN }}
+        run: |
+          # Create a run ID
+          RUN_ID_RESPONSE=$(curl --request POST \
+            --url "https://api.qase.io/v1/run/$PROJECT_CODE" \
+            --header "Token: $QASE_API_TOKEN" \
+            --header "accept: application/json" \
+            --header "content-type: application/json" \
+            --data '{
+            "cases": ['"$CASE_ID_LIST"'],
+            "title": "'"$QASE_RUN_NAME"'"
+          }')
+          echo "Run ID response: $RUN_ID_RESPONSE"
           
-          ## step
+          # set the run ID as an output variable
+          RUN_ID=$(echo $RUN_ID_RESPONSE | jq -r '.result.id')
           
+          if [ -z "$RUN_ID" ] || [ "$RUN_ID" == "null" ]; then
+            echo "Failed to create Qase run"
+          fi
           
-          # complete the run
-          COMPLETE_RUN=$(curl --request POST \
-            --url https://api.qase.io/v1/run/K3SRKE2/$RUN_ID/complete \
-            --header 'Token: $QASE_API_TOKEN' \
-            --header 'accept: application/json'
-            )
+          # Set the run ID as an output variable using the environment file
+          echo "QASE_RUN_ID=$RUN_ID" >> $GITHUB_ENV
+        continue-on-error: true
+
+      - name: Process Test Results
+        if: always()
+        id: process-test-results
+        env:
+          CASE_ID_LIST:  ${{ env.CASE_ID_LIST }}
+        run: |
+          GITHUB_RUN_URL="${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+          COMMENT_LINK="In case of failure in GitHub Actions run. See details here: $GITHUB_RUN_URL"
+
+          IFS=',' read -r -a CASE_IDS <<< "$CASE_ID_LIST"
+          COUNTER=0
+          results='[]'
+
+          while IFS= read -r line; do
+            TEST_NAME=$(echo "$line" | awk -F': ' '{print $1}')
+            TEST_STATUS=$(echo "$line" | awk -F': ' '{print $2}')
+            TEST_CASE_ID=${CASE_IDS[$COUNTER]}
+
+            COUNTER=$((COUNTER + 1))
+            if [ $COUNTER -ge ${#CASE_IDS[@]} ]; then
+              COUNTER=0
+            fi
 
-            RUN_STATUS=$(echo $COMPLETE_RUN | jq -r '.status')
-              if [[ $RUN_STATUS != true ]]; then
-                echo "Failed to complete the run"
-              fi
+            if [ "$TEST_STATUS" == "success" ]; then
+              STATUS="passed"
+            else
+              STATUS="failed"
+            fi
 
-#          # make run public
-#            PUBLISH_RUN=$(curl --request PATCH \
-#            --url https://api.qase.io/v1/run/K3SRKE2/$RUN_ID/public \
-#            --header 'Token: $QASE_API_TOKEN' \
-#            --header 'accept: application/json' \
-#            --header 'content-type: application/json' \
-#            --data '{"status":true}'
-#            )
-#
-#          REPORT_URL=$(echo $PUBLISH_RUN | jq -r '.result.url')
-#          if [[ -n "${REPORT_URL}" ]]; then
-#            echo report url: ${REPORT_URL}
-#            echo "## QASE Reporting" >> ${GITHUB_STEP_SUMMARY}
-#            echo "Public Qase report: ${REPORT_URL}" >> ${GITHUB_STEP_SUMMARY}
-#          fi
+            results=$(echo "$results" | jq --arg case_id "$TEST_CASE_ID" --arg status "$STATUS" --arg comment "$COMMENT_LINK" \
+            '. + [{ "case_id": ($case_id|tonumber), "status": $status, "comment": $comment }]')
+          done < /tmp/k3s-install-test-results.log
 
-      - name: Run Tests and Upload Results to Qase
+          echo "$results" > results.json
+        continue-on-error: true
+
+      - name: Publish Test Results
+        if: always()
         env:
+          RUN_ID: ${{ env.QASE_RUN_ID }}
+          PROJECT_CODE: ${{ env.PROJECT_CODE }}
           QASE_API_TOKEN: ${{ secrets.QASE_API_TOKEN }}
-          QASE_RUN_ID: ${{ env.QASE_RUN_ID }}
         run: |
-          echo "Run K3s Smoke Test"
-           #Example: ./run-tests.sh and capture results in a file, e.g., test-results.json
-          ./run-tests.sh > test-results.json
+          results=$(cat results.json)
+          RESPONSE=$(curl --request POST \
+            --url "https://api.qase.io/v1/result/${PROJECT_CODE}/${RUN_ID}/bulk" \
+            --header "Token: $QASE_API_TOKEN" \
+            --header 'accept: application/json' \
+            --header "Content-Type: application/json" \
+            --data "{\"results\": $results}")
 
- 
+          echo "Publish test results response: $RESPONSE"
+        continue-on-error: true
+
+      - name: Complete Qase Run
+        if: always()
+        env:
+          RUN_ID: ${{ env.QASE_RUN_ID }}
+          PROJECT_CODE: ${{ env.PROJECT_CODE }}
+          QASE_API_TOKEN: ${{ secrets.QASE_API_TOKEN }}
+        run: |
+          COMPLETE_RUN=$(curl --request POST \
+          --url "https://api.qase.io/v1/run/${PROJECT_CODE}/${RUN_ID}/complete" \
+          --header "Token: $QASE_API_TOKEN" \
+          --header 'accept: application/json')
           
-
+          RUN_STATUS=$(echo $COMPLETE_RUN | jq -r '.status')
+            if [[ $RUN_STATUS != true ]]; then
+              echo "Failed to complete the run"
+            else
+              echo "Run completed successfully"
+            fi
+        continue-on-error: true
 
diff --git a/.golangci.json b/.golangci.json
@@ -10,20 +10,20 @@
 		]
 	},
 	"run": {
-		"skip-dirs": [
+		"deadline": "5m"
+	},
+	"issues": {
+		"exclude-dirs": [
 			"build",
 			"contrib",
 			"manifests",
 			"package",
 			"scripts",
 			"vendor"
 		],
-		"skip-files": [
+		"exclude-files": [
 			"/zz_generated_"
 		],
-		"deadline": "5m"
-	},
-	"issues": {
 		"exclude-rules": [
 			{
 				"linters": "typecheck",
@@ -43,4 +43,4 @@
 			}
 		]
 	}
-}
+}
diff --git a/Dockerfile.dapper b/Dockerfile.dapper
@@ -22,7 +22,7 @@ RUN apk -U --no-cache add \
 RUN python3 -m pip install awscli
 
 # Install Trivy
-ENV TRIVY_VERSION="0.50.1"
+ENV TRIVY_VERSION="0.51.4"
 RUN case "$(go env GOARCH)" in \
     arm64) TRIVY_ARCH="ARM64" ;; \
     amd64) TRIVY_ARCH="64bit" ;; \

diff --git a/channel.yaml b/channel.yaml
@@ -1,7 +1,7 @@
 # Example channels config
 channels:
 - name: stable
-  latest: v1.29.4+k3s1
+  latest: v1.29.5+k3s1
 - name: latest
   latestRegexp: .*
   excludeRegexp: (^[^+]+-|v1\.25\.5\+k3s1|v1\.26\.0\+k3s1)

diff --git a/conformance/Dockerfile b/conformance/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.18
+FROM alpine:3.20
 ENV SONOBUOY_VERSION 0.57.1
 RUN apk add curl tar gzip
 RUN curl -sfL https://github.com/vmware-tanzu/sonobuoy/releases/download/v${SONOBUOY_VERSION}/sonobuoy_${SONOBUOY_VERSION}_linux_amd64.tar.gz | tar xvzf - -C /usr/bin