@@ -620,108 +620,108 @@ jobs:
620620 uses : ./.github/actions/upload-test-failures
621621 with :
622622 job-name : ${{ github.job }}
623- # test-ubuntu-io-threads:
624- # runs-on: ubuntu-latest
625- # if: |
626- # (github.event_name == 'workflow_call' || github.event_name == 'workflow_dispatch' ||
627- # (github.event_name == 'schedule' && github.repository == 'valkey-io/valkey') ||
628- # (github.event_name == 'pull_request' &&
629- # (github.event.pull_request.base.ref != 'unstable' ||
630- # contains(github.event.pull_request.labels.*.name, 'run-extra-tests')) &&
631- # (github.event.action != 'labeled' ||
632- # (github.event.pull_request.base.ref == 'unstable' && github.event.label.name == 'run-extra-tests'))
633- # )) &&
634- # !contains(github.event.inputs.skipjobs, 'iothreads')
635- # timeout-minutes: 1440
636- # steps:
637- # - name: prep
638- # if: github.event_name == 'workflow_dispatch' || github.event_name == 'workflow_call'
639- # run: |
640- # echo "GITHUB_REPOSITORY=${{inputs.use_repo || github.event.inputs.use_repo}}" >> $GITHUB_ENV
641- # echo "GITHUB_HEAD_REF=${{inputs.use_git_ref || github.event.inputs.use_git_ref}}" >> $GITHUB_ENV
642- # echo "skipjobs: ${{github.event.inputs.skipjobs}}"
643- # echo "skiptests: ${{github.event.inputs.skiptests}}"
644- # echo "test_args: ${{github.event.inputs.test_args}}"
645- # echo "cluster_test_args: ${{github.event.inputs.cluster_test_args}}"
646- # - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
647- # with:
648- # repository: ${{ inputs.use_repo || github.event.inputs.use_repo || github.repository }}
649- # ref: ${{ inputs.use_git_ref || github.event.inputs.use_git_ref || github.ref }}
650- # - name: Install libbacktrace
651- # uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
652- # with:
653- # repository: ianlancetaylor/libbacktrace
654- # ref: b9e40069c0b47a722286b94eb5231f7f05c08713
655- # path: libbacktrace
656- # - run: cd libbacktrace && ./configure && make && sudo make install
657- # - name: make
658- # run: make SERVER_CFLAGS='-Werror' USE_LIBBACKTRACE=yes
659- # - name: testprep
660- # run: sudo apt-get install tcl8.6 tclx
661- # - name: test
662- # if: true && !contains(github.event.inputs.skiptests, 'valkey')
663- # run: ./runtest --io-threads --accurate --failures-json test-failures/valkey.json --verbose --tags network --dump-logs ${{github.event.inputs.test_args}}
664- # - name: cluster tests
665- # if: true && !contains(github.event.inputs.skiptests, 'cluster')
666- # run: ./runtest-cluster --failures-json test-failures/cluster.json --io-threads ${{github.event.inputs.cluster_test_args}}
667- # - name: Upload test failures
668- # if: always()
669- # uses: ./.github/actions/upload-test-failures
670- # with:
671- # job-name: ${{ github.job }}
672- # test-ubuntu-tls-io-threads:
673- # runs-on: ubuntu-latest
674- # if: |
675- # (github.event_name == 'workflow_call' || github.event_name == 'workflow_dispatch' ||
676- # (github.event_name == 'schedule' && github.repository == 'valkey-io/valkey') ||
677- # (github.event_name == 'pull_request' &&
678- # (github.event.pull_request.base.ref != 'unstable' ||
679- # contains(github.event.pull_request.labels.*.name, 'run-extra-tests')) &&
680- # (github.event.action != 'labeled' ||
681- # (github.event.pull_request.base.ref == 'unstable' && github.event.label.name == 'run-extra-tests'))
682- # )) &&
683- # !contains(github.event.inputs.skipjobs, 'tls') && !contains(github.event.inputs.skipjobs, 'iothreads')
684- # timeout-minutes: 1440
685- # steps:
686- # - name: prep
687- # if: github.event_name == 'workflow_dispatch' || github.event_name == 'workflow_call'
688- # run: |
689- # echo "GITHUB_REPOSITORY=${{inputs.use_repo || github.event.inputs.use_repo}}" >> $GITHUB_ENV
690- # echo "GITHUB_HEAD_REF=${{inputs.use_git_ref || github.event.inputs.use_git_ref}}" >> $GITHUB_ENV
691- # echo "skipjobs: ${{github.event.inputs.skipjobs}}"
692- # echo "skiptests: ${{github.event.inputs.skiptests}}"
693- # echo "test_args: ${{github.event.inputs.test_args}}"
694- # echo "cluster_test_args: ${{github.event.inputs.cluster_test_args}}"
695- # - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
696- # with:
697- # repository: ${{ inputs.use_repo || github.event.inputs.use_repo || github.repository }}
698- # ref: ${{ inputs.use_git_ref || github.event.inputs.use_git_ref || github.ref }}
699- # - name: Install libbacktrace
700- # uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
701- # with:
702- # repository: ianlancetaylor/libbacktrace
703- # ref: b9e40069c0b47a722286b94eb5231f7f05c08713
704- # path: libbacktrace
705- # - run: cd libbacktrace && ./configure && make && sudo make install
706- # - name: make
707- # run: make BUILD_TLS=yes SERVER_CFLAGS='-Werror' USE_LIBBACKTRACE=yes
708- # - name: testprep
709- # run: |
710- # sudo apt-get install tcl8.6 tclx tcl-tls
711- # ./utils/gen-test-certs.sh
712- # - name: test
713- # if: true && !contains(github.event.inputs.skiptests, 'valkey')
714- # run: |
715- # ./runtest --io-threads --tls --accurate --failures-json test-failures/valkey.json --verbose --tags network --dump-logs ${{github.event.inputs.test_args}}
716- # - name: cluster tests
717- # if: true && !contains(github.event.inputs.skiptests, 'cluster')
718- # run: |
719- # ./runtest-cluster --failures-json test-failures/cluster.json --io-threads --tls ${{github.event.inputs.cluster_test_args}}
720- # - name: Upload test failures
721- # if: always()
722- # uses: ./.github/actions/upload-test-failures
723- # with:
724- # job-name: ${{ github.job }}
623+ test-ubuntu-io-threads :
624+ runs-on : ubuntu-latest
625+ if : |
626+ (github.event_name == 'workflow_call' || github.event_name == 'workflow_dispatch' ||
627+ (github.event_name == 'schedule' && github.repository == 'valkey-io/valkey') ||
628+ (github.event_name == 'pull_request' &&
629+ (github.event.pull_request.base.ref != 'unstable' ||
630+ contains(github.event.pull_request.labels.*.name, 'run-extra-tests')) &&
631+ (github.event.action != 'labeled' ||
632+ (github.event.pull_request.base.ref == 'unstable' && github.event.label.name == 'run-extra-tests'))
633+ )) &&
634+ !contains(github.event.inputs.skipjobs, 'iothreads')
635+ timeout-minutes : 1440
636+ steps :
637+ - name : prep
638+ if : github.event_name == 'workflow_dispatch' || github.event_name == 'workflow_call'
639+ run : |
640+ echo "GITHUB_REPOSITORY=${{inputs.use_repo || github.event.inputs.use_repo}}" >> $GITHUB_ENV
641+ echo "GITHUB_HEAD_REF=${{inputs.use_git_ref || github.event.inputs.use_git_ref}}" >> $GITHUB_ENV
642+ echo "skipjobs: ${{github.event.inputs.skipjobs}}"
643+ echo "skiptests: ${{github.event.inputs.skiptests}}"
644+ echo "test_args: ${{github.event.inputs.test_args}}"
645+ echo "cluster_test_args: ${{github.event.inputs.cluster_test_args}}"
646+ - uses : actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
647+ with :
648+ repository : ${{ inputs.use_repo || github.event.inputs.use_repo || github.repository }}
649+ ref : ${{ inputs.use_git_ref || github.event.inputs.use_git_ref || github.ref }}
650+ - name : Install libbacktrace
651+ uses : actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
652+ with :
653+ repository : ianlancetaylor/libbacktrace
654+ ref : b9e40069c0b47a722286b94eb5231f7f05c08713
655+ path : libbacktrace
656+ - run : cd libbacktrace && ./configure && make && sudo make install
657+ - name : make
658+ run : make SERVER_CFLAGS='-Werror' USE_LIBBACKTRACE=yes
659+ - name : testprep
660+ run : sudo apt-get install tcl8.6 tclx
661+ - name : test
662+ if : true && !contains(github.event.inputs.skiptests, 'valkey')
663+ run : ./runtest --io-threads --accurate --failures-json test-failures/valkey.json --verbose --tags network --dump-logs ${{github.event.inputs.test_args}}
664+ - name : cluster tests
665+ if : true && !contains(github.event.inputs.skiptests, 'cluster')
666+ run : ./runtest-cluster --failures-json test-failures/cluster.json --io-threads ${{github.event.inputs.cluster_test_args}}
667+ - name : Upload test failures
668+ if : always()
669+ uses : ./.github/actions/upload-test-failures
670+ with :
671+ job-name : ${{ github.job }}
672+ test-ubuntu-tls-io-threads :
673+ runs-on : ubuntu-latest
674+ if : |
675+ (github.event_name == 'workflow_call' || github.event_name == 'workflow_dispatch' ||
676+ (github.event_name == 'schedule' && github.repository == 'valkey-io/valkey') ||
677+ (github.event_name == 'pull_request' &&
678+ (github.event.pull_request.base.ref != 'unstable' ||
679+ contains(github.event.pull_request.labels.*.name, 'run-extra-tests')) &&
680+ (github.event.action != 'labeled' ||
681+ (github.event.pull_request.base.ref == 'unstable' && github.event.label.name == 'run-extra-tests'))
682+ )) &&
683+ !contains(github.event.inputs.skipjobs, 'tls') && !contains(github.event.inputs.skipjobs, 'iothreads')
684+ timeout-minutes : 1440
685+ steps :
686+ - name : prep
687+ if : github.event_name == 'workflow_dispatch' || github.event_name == 'workflow_call'
688+ run : |
689+ echo "GITHUB_REPOSITORY=${{inputs.use_repo || github.event.inputs.use_repo}}" >> $GITHUB_ENV
690+ echo "GITHUB_HEAD_REF=${{inputs.use_git_ref || github.event.inputs.use_git_ref}}" >> $GITHUB_ENV
691+ echo "skipjobs: ${{github.event.inputs.skipjobs}}"
692+ echo "skiptests: ${{github.event.inputs.skiptests}}"
693+ echo "test_args: ${{github.event.inputs.test_args}}"
694+ echo "cluster_test_args: ${{github.event.inputs.cluster_test_args}}"
695+ - uses : actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
696+ with :
697+ repository : ${{ inputs.use_repo || github.event.inputs.use_repo || github.repository }}
698+ ref : ${{ inputs.use_git_ref || github.event.inputs.use_git_ref || github.ref }}
699+ - name : Install libbacktrace
700+ uses : actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
701+ with :
702+ repository : ianlancetaylor/libbacktrace
703+ ref : b9e40069c0b47a722286b94eb5231f7f05c08713
704+ path : libbacktrace
705+ - run : cd libbacktrace && ./configure && make && sudo make install
706+ - name : make
707+ run : make BUILD_TLS=yes SERVER_CFLAGS='-Werror' USE_LIBBACKTRACE=yes
708+ - name : testprep
709+ run : |
710+ sudo apt-get install tcl8.6 tclx tcl-tls
711+ ./utils/gen-test-certs.sh
712+ - name : test
713+ if : true && !contains(github.event.inputs.skiptests, 'valkey')
714+ run : |
715+ ./runtest --io-threads --tls --accurate --failures-json test-failures/valkey.json --verbose --tags network --dump-logs ${{github.event.inputs.test_args}}
716+ - name : cluster tests
717+ if : true && !contains(github.event.inputs.skiptests, 'cluster')
718+ run : |
719+ ./runtest-cluster --failures-json test-failures/cluster.json --io-threads --tls ${{github.event.inputs.cluster_test_args}}
720+ - name : Upload test failures
721+ if : always()
722+ uses : ./.github/actions/upload-test-failures
723+ with :
724+ job-name : ${{ github.job }}
725725 test-ubuntu-reclaim-cache :
726726 runs-on : ubuntu-latest
727727 if : |
@@ -2080,8 +2080,8 @@ jobs:
20802080 - test-ubuntu-32bit
20812081 - test-ubuntu-tls
20822082 - test-ubuntu-tls-no-tls
2083- # - test-ubuntu-io-threads
2084- # - test-ubuntu-tls-io-threads
2083+ - test-ubuntu-io-threads
2084+ - test-ubuntu-tls-io-threads
20852085 - test-valgrind-test
20862086 - test-valgrind-misc
20872087 - test-valgrind-no-malloc-usable-size-test
@@ -2180,8 +2180,8 @@ jobs:
21802180 - test-ubuntu-32bit
21812181 - test-ubuntu-tls
21822182 - test-ubuntu-tls-no-tls
2183- # - test-ubuntu-io-threads
2184- # - test-ubuntu-tls-io-threads
2183+ - test-ubuntu-io-threads
2184+ - test-ubuntu-tls-io-threads
21852185 - test-ubuntu-reclaim-cache
21862186 - test-valgrind-test
21872187 - test-valgrind-misc
0 commit comments