File tree Expand file tree Collapse file tree 4 files changed +16
-0
lines changed Expand file tree Collapse file tree 4 files changed +16
-0
lines changed Original file line number Diff line number Diff line change 3535        required : false 
3636        default : false 
3737        type : boolean 
38+       skip-flaky :
39+         required : false 
40+         default : false 
41+         type : boolean 
3842
3943env :
4044  GOTOOLCHAIN : local 
@@ -171,6 +175,7 @@ jobs:
171175          fi 
172176#  FIXME: this NEEDS to go away
173177      - name : " Run: integration tests (flaky)" 
178+         if : ${{ !fromJSON(inputs.skip-flaky) }} 
174179        run : | 
175180          . ./hack/github/action-helpers.sh 
176181          github::md::h2 "flaky" >> "$GITHUB_STEP_SUMMARY" 
Original file line number Diff line number Diff line change 1616      guest :
1717        required : true 
1818        type : string 
19+       skip-flaky :
20+         required : false 
21+         default : false 
22+         type : boolean 
1923
2024jobs :
2125  test :
@@ -114,6 +118,7 @@ jobs:
114118            docker run -t -v /dev:/dev --rm --privileged test-integration ./hack/test-integration.sh -test.only-flaky=false 
115119          fi 
116120name : " Run: integration tests (flaky)" 
121+         if : ${{ !fromJSON(inputs.skip-flaky) }} 
117122        run : | 
118123          set -eux 
119124          if [ "$TARGET" = "rootless" ]; then 
Original file line number Diff line number Diff line change 2929      runner : ubuntu-24.04 
3030      guest : ${{ matrix.guest }} 
3131      target : ${{ matrix.target }} 
32+       skip-flaky : true   #  skip the most flaky ones for now
3233
3334  test-integration-freebsd :
3435    name : " FreeBSD" 
Original file line number Diff line number Diff line change 6969          #  arm64
7070          - runner : ubuntu-24.04-arm 
7171            target : rootless 
72+             skip-flaky : true 
7273          #  port-slirp4netns
7374          - runner : ubuntu-24.04 
7475            target : rootless-port-slirp4netns 
76+             skip-flaky : true 
7577          #  old containerd + old ubuntu + old rootlesskit
7678          - runner : ubuntu-22.04 
7779            target : rootless 
8890          #  arm64
8991          - runner : ubuntu-24.04-arm 
9092            target : rootful 
93+             skip-flaky : true 
9194          #  old containerd + old ubuntu
9295          - runner : ubuntu-22.04 
9396            target : rootful 
9699          - runner : ubuntu-24.04 
97100            target : rootful 
98101            ipv6 : true 
102+             skip-flaky : true 
99103          #  all canary
100104          - runner : ubuntu-24.04 
101105            target : rootful 
@@ -110,6 +114,7 @@ jobs:
110114      rootlesskit-version : ${{ matrix.rootlesskit-version }} 
111115      ipv6 : ${{ matrix.ipv6 && true || false }} 
112116      canary : ${{ matrix.canary && true || false }} 
117+       skip-flaky : ${{ matrix.skip-flaky && true || false }} 
113118
114119  test-integration-host :
115120    name : " in-host${{ inputs.hack }}" 
 
 
   
 
     
   
   
          
    
    
     
    
      
     
     
    You can’t perform that action at this time.
  
 
    
  
    
      
        
     
       
      
     
   
 
    
    
  
 
  
 
     
    
0 commit comments