Skip to content

Commit

Permalink
Merge branch 'master' into jvolivie/fused
Browse files Browse the repository at this point in the history
Features: dfuse
Allow-unstable-test: true
  • Loading branch information
jolivier23 committed Dec 21, 2024
2 parents 7585023 + 8984dd6 commit 45a2e77
Show file tree
Hide file tree
Showing 113 changed files with 3,078 additions and 528 deletions.
11 changes: 8 additions & 3 deletions .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,18 @@ jobs:
name: Python isort
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- name: Checkout code
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
with:
ref: ${{ github.event.pull_request.head.sha }}
- uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
- name: Set up Python environment
uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
with:
python-version: '3'
- uses: isort/isort-action@f14e57e1d457956c45a19c05a89cccdf087846e5 # v1.1.0
- name: Install extra python packages
run: python3 -m pip install --requirement utils/cq/requirements.txt
- name: Run isort
uses: isort/isort-action@24d8a7a51d33ca7f36c3f23598dafa33f7071326 # v1.1.1
with:
requirementsFiles: "requirements.txt"
- name: Run on SConstruct file.
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/pr-metadata.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,12 @@ jobs:
id: jira-data
- name: Comment on PR
if: always()
uses: thollander/actions-comment-pull-request@v2
# yamllint disable-line rule:line-length
uses: thollander/actions-comment-pull-request@24bffb9b452ba05a4f3f77933840a6a841d1b32b # v3.0.1
with:
comment_tag: 'jira_query_message'
comment-tag: 'jira_query_message'
message: ${{ steps.jira-data.outputs.message }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
github-token: ${{ secrets.GITHUB_TOKEN }}
- name: Set labels
if: ${{ always() && steps.jira-data.outputs.label != '' }}
uses: actions-ecosystem/action-add-labels@v1
Expand Down
35 changes: 8 additions & 27 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -364,25 +364,6 @@ pipeline {
stage('Check PR') {
when { changeRequest() }
parallel {
stage('Used Required Git Hooks') {
steps {
catchError(stageResult: 'UNSTABLE', buildResult: 'SUCCESS',
message: 'PR did not get committed with required git hooks. ' +
'Please see utils/githooks/README.md.') {
sh 'if ! ' + cachedCommitPragma('Required-githooks', 'false') + '''; then
echo 'PR did not get committed with required git hooks. ' +
'Please see utils/githooks/README.md.'
exit 1
fi'''
}
}
post {
unsuccessful {
echo 'PR did not get committed with required git hooks. ' +
'Please see utils/githooks/README.md.'
}
}
} // stage('Used Required Git Hooks')
stage('Branch name check') {
when { changeRequest() }
steps {
Expand Down Expand Up @@ -965,7 +946,7 @@ pipeline {
}
}
} // stage('Functional on EL 9')
stage('Functional on Leap 15.5') {
stage('Functional on Leap 15.6') {
when {
beforeAgent true
expression { !skipStage() }
Expand All @@ -986,7 +967,7 @@ pipeline {
job_status_update()
}
} // post
} // stage('Functional on Leap 15.5')
} // stage('Functional on Leap 15.6')
stage('Functional on Ubuntu 20.04') {
when {
beforeAgent true
Expand Down Expand Up @@ -1061,7 +1042,7 @@ pipeline {
job_status_update()
}
}
} // stage('Fault inection testing on EL 8.8')
} // stage('Fault injection testing on EL 8.8')
stage('Test RPMs on EL 8.6') {
when {
beforeAgent true
Expand All @@ -1081,8 +1062,8 @@ pipeline {
rpm_test_post(env.STAGE_NAME, env.NODELIST)
}
}
} // stage('Test CentOS 7 RPMs')
stage('Test RPMs on Leap 15.4') {
} // stage('Test RPMs on EL 8.6')
stage('Test RPMs on Leap 15.5') {
when {
beforeAgent true
expression { ! skipStage() }
Expand All @@ -1096,8 +1077,8 @@ pipeline {
* additionally for this use-case, can't override
ftest_arg with this :-(
script {
'Test RPMs on Leap 15.4': getFunctionalTestStage(
name: 'Test RPMs on Leap 15.4',
'Test RPMs on Leap 15.5': getFunctionalTestStage(
name: 'Test RPMs on Leap 15.5',
pragma_suffix: '',
label: params.CI_UNIT_VM1_LABEL,
next_version: next_version,
Expand Down Expand Up @@ -1133,7 +1114,7 @@ pipeline {
rpm_test_post(env.STAGE_NAME, env.NODELIST)
}
}
} // stage('Test Leap 15 RPMs')
} // stage('Test RPMs on Leap 15.5')
} // parallel
} // stage('Test')
stage('Test Storage Prep on EL 8.8') {
Expand Down
4 changes: 4 additions & 0 deletions ci/parse_ci_envs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ if [ -n "${STAGE_NAME:?}" ]; then
: "${TARGET:=centos9}"
: "${REPO_SPEC:=el-9}"
;;
*Leap\ 15.6*|*leap15.6*|*opensuse15.6*|*sles15.6*)
: "${CHROOT_NAME:=opensuse-leap-15.5-x86_64}"
: "${TARGET:=leap15.6}"
;;
*Leap\ 15.5*|*leap15.5*|*opensuse15.5*|*sles15.5*)
: "${CHROOT_NAME:=opensuse-leap-15.5-x86_64}"
: "${TARGET:=leap15.5}"
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ line_length = 99
skip_gitignore = true

[tool.codespell]
skip = './src/control/vendor,./src/control/go.sum,./.git,./src/rdb/raft,./build,./install,./venv,./src/control/vendor/,./src/control/security/testdata/certs/source.txt'
skip = './src/control/vendor/*,./src/control/go.sum,./.git/*,./src/rdb/raft/*,./build/*,./install/*,./venv/*,./src/control/security/testdata/certs/source.txt'
quiet-level = 3
ignore-words = 'ci/codespell.ignores'
builtin = 'clear,rare,informal,names,en-GB_to_en-US'
6 changes: 3 additions & 3 deletions src/control/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ require (
github.com/prometheus/client_model v0.2.0
github.com/prometheus/common v0.32.1
go.etcd.io/bbolt v1.3.5
golang.org/x/net v0.26.0
golang.org/x/sys v0.21.0
golang.org/x/net v0.33.0
golang.org/x/sys v0.28.0
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1
google.golang.org/grpc v1.66.2
google.golang.org/protobuf v1.34.1
Expand All @@ -50,5 +50,5 @@ require (
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
golang.org/x/text v0.16.0 // indirect
golang.org/x/text v0.21.0 // indirect
)
12 changes: 6 additions & 6 deletions src/control/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -392,8 +392,8 @@ golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81R
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20210907225631-ff17edfbf26d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
Expand Down Expand Up @@ -459,8 +459,8 @@ golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
Expand All @@ -470,8 +470,8 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
Expand Down
4 changes: 2 additions & 2 deletions src/control/vendor/golang.org/x/net/LICENSE

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions src/control/vendor/golang.org/x/net/http2/client_conn_pool.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

122 changes: 122 additions & 0 deletions src/control/vendor/golang.org/x/net/http2/config.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 45a2e77

Please sign in to comment.