Skip to content

Commit 923721d

Browse files
tallpsmithtallpsmith
committed
2 parents 4d413d0 + ad71c0d commit 923721d

58 files changed

Lines changed: 3046 additions & 517 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
# always() is required here to run this step even if the build fails
8181
# otherwise the platform will be skipped in the test report (it should be flagged as broken)
8282
if: always()
83-
uses: actions/upload-artifact@v6
83+
uses: actions/upload-artifact@v7
8484
with:
8585
name: build-${{ matrix.platform }}
8686
path: artifacts/build
@@ -102,7 +102,7 @@ jobs:
102102

103103
- name: Upload test results
104104
if: always() && steps.init_qa.outcome == 'success'
105-
uses: actions/upload-artifact@v6
105+
uses: actions/upload-artifact@v7
106106
with:
107107
name: test-${{ matrix.platform }}
108108
path: artifacts/test

‎.github/workflows/ghcr.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ jobs:
2222
uses: actions/checkout@v6
2323

2424
- name: Log in to the container registry
25-
uses: docker/login-action@v3
25+
uses: docker/login-action@v4
2626
with:
2727
registry: ${{ env.REGISTRY }}
2828
username: ${{ github.actor }}
2929
password: ${{ secrets.GITHUB_TOKEN }}
3030

3131
- name: Set up Docker Buildx
32-
uses: docker/setup-buildx-action@v3
32+
uses: docker/setup-buildx-action@v4
3333

3434
- name: Extract tags and labels for base image
3535
id: meta_base
@@ -46,7 +46,7 @@ jobs:
4646
tags: type=raw,value=latest,enable={{is_default_branch}}
4747

4848
- name: Build and push base image
49-
uses: docker/build-push-action@v6
49+
uses: docker/build-push-action@v7
5050
with:
5151
context: .
5252
file: ./build/containers/pcp/Containerfile
@@ -56,7 +56,7 @@ jobs:
5656
platforms: ${{ env.PLATFORMS }}
5757

5858
- name: Build and push archive-analysis image
59-
uses: docker/build-push-action@v6
59+
uses: docker/build-push-action@v7
6060
with:
6161
context: .
6262
file: ./build/containers/archive-analysis/Containerfile

‎.github/workflows/qa.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ jobs:
126126
# always() is required here to run this step even if the build fails
127127
# otherwise the platform will be skipped in the test report (it should be flagged as broken)
128128
if: always()
129-
uses: actions/upload-artifact@v6
129+
uses: actions/upload-artifact@v7
130130
with:
131131
name: build-${{ matrix.platform }}
132132
path: artifacts/build
@@ -150,7 +150,7 @@ jobs:
150150

151151
- name: Upload test results
152152
if: always() && steps.init_qa.outcome == 'success'
153-
uses: actions/upload-artifact@v6
153+
uses: actions/upload-artifact@v7
154154
with:
155155
name: test-${{ matrix.platform }}
156156
path: artifacts/test
@@ -175,7 +175,7 @@ jobs:
175175
path: qa-reports
176176

177177
- name: Download artifacts
178-
uses: actions/download-artifact@v7
178+
uses: actions/download-artifact@v8
179179
with:
180180
path: artifacts
181181

@@ -203,7 +203,7 @@ jobs:
203203
cat summary.txt
204204
205205
- name: Upload test summary
206-
uses: actions/upload-artifact@v6
206+
uses: actions/upload-artifact@v7
207207
with:
208208
name: qasummary
209209
path: summary.txt
@@ -249,7 +249,7 @@ jobs:
249249
cd allure-report && zip -q -r ../qareport.zip . && cd ..
250250
251251
- name: Upload test report
252-
uses: actions/upload-artifact@v6
252+
uses: actions/upload-artifact@v7
253253
with:
254254
name: qareport
255255
path: qareport.zip
@@ -276,7 +276,7 @@ jobs:
276276
ssh-key: ${{ secrets.QA_REPORT_DEPLOY_KEY }}
277277

278278
- name: Download artifacts
279-
uses: actions/download-artifact@v7
279+
uses: actions/download-artifact@v8
280280
with:
281281
path: artifacts
282282

‎.github/workflows/quay.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ jobs:
2222
uses: actions/checkout@v6
2323

2424
- name: Log in to the container registry
25-
uses: docker/login-action@v3
25+
uses: docker/login-action@v4
2626
with:
2727
registry: ${{ env.REGISTRY }}
2828
username: ${{ secrets.QUAY_USERNAME }}
2929
password: ${{ secrets.QUAY_PASSWORD }}
3030

3131
- name: Set up Docker Buildx
32-
uses: docker/setup-buildx-action@v3
32+
uses: docker/setup-buildx-action@v4
3333

3434
- name: Extract tags and labels for base image
3535
id: meta_base
@@ -46,7 +46,7 @@ jobs:
4646
tags: type=raw,value=latest,enable={{is_default_branch}}
4747

4848
- name: Build and push base image
49-
uses: docker/build-push-action@v6
49+
uses: docker/build-push-action@v7
5050
with:
5151
context: .
5252
file: ./build/containers/pcp/Containerfile
@@ -56,7 +56,7 @@ jobs:
5656
platforms: ${{ env.PLATFORMS }}
5757

5858
- name: Build and push archive-analysis image
59-
uses: docker/build-push-action@v6
59+
uses: docker/build-push-action@v7
6060
with:
6161
context: .
6262
file: ./build/containers/archive-analysis/Containerfile

‎.github/workflows/release.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
run: build/ci/ci-run.py ${{ matrix.platform }} artifacts build --path artifacts/build
6666

6767
- name: Publish build artifacts
68-
uses: actions/upload-artifact@v6
68+
uses: actions/upload-artifact@v7
6969
with:
7070
name: build-${{ matrix.platform }}
7171
path: artifacts/build
@@ -87,7 +87,7 @@ jobs:
8787

8888
- name: Publish test results
8989
if: always() && steps.init_qa.outcome == 'success'
90-
uses: actions/upload-artifact@v6
90+
uses: actions/upload-artifact@v7
9191
with:
9292
name: test-${{ matrix.platform }}
9393
path: artifacts/test
@@ -102,7 +102,7 @@ jobs:
102102
uses: actions/checkout@v6
103103

104104
- name: Download all artifacts
105-
uses: actions/download-artifact@v7
105+
uses: actions/download-artifact@v8
106106
with:
107107
path: artifacts
108108

‎cscope.run‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ if $rebuild || [ ! -f cscope.files ]
4444
then
4545
rm -f cscope.out cscope.files
4646
git ls-files >$tmp.tmp
47-
find src qa -type f -a \( -name "*.[chly]" -o -name "*.h.in" -o -name "*.y.in" -o -name "*.cpp" \) \
47+
find src vendor qa -type f -a \( -name "*.[chly]" -o -name "*.h.in" -o -name "*.y.in" -o -name "*.cpp" \) \
4848
| while read file
4949
do
5050
if grep "^$file\$" $tmp.tmp >/dev/null

‎images/pcplogo-80.png‎

7.89 KB
Loading

‎qa/.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# cleaned up in "make clobber" should also be mentioned here ...
33
#
44
.rnd
5-
.findmetric/
5+
.find-metric/
66
/*.full
77
/*.notrun
88
/*.full.ok

‎qa/1131‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ $python -c "from collections import OrderedDict" >/dev/null 2>&1
1818
which pcp2json >/dev/null 2>&1 || _notrun "pcp2json not installed"
1919
which pcp2openmetrics >/dev/null 2>&1 || _notrun "pcp2openmetrics not installed"
2020
which pcp2opentelemetry >/dev/null 2>&1 || _notrun "pcp2opentelemetry not installed"
21+
which jq >/dev/null 2>&1 || _notrun "jq not installed"
2122

2223
_cleanup()
2324
{
@@ -76,7 +77,7 @@ s/ 85.0.0 / PMID /
7677
_filter_pcp2opentelemetry()
7778
{
7879
tee -a $here/$seq.full \
79-
| col -b \
80+
| jq \
8081
| sed \
8182
-e 's/\"stringValue\": \"[^\"]*\"/\"stringValue\": \"VALUE\"/g'\
8283
-e 's/\"timeUnixNano\": \"[^\"]*\"/\"timeUnixNano\": \"TIME\"/g'\
@@ -90,25 +91,25 @@ _filter_pcp2opentelemetry()
9091
_save_config $PCP_SYSCONF_DIR/labels
9192
$sudo rm -rf $PCP_SYSCONF_DIR/labels/*
9293

93-
echo "---"
94+
echo "--- pcp2json -a archives/rep -H -I -z \"\""
9495
pcp2json -a $A -H -I -z "" | _archive_filter
95-
echo "---"
96+
echo "--- pcp2json -a archives/rep -H -I -z -E \"\""
9697
pcp2json -a $A -H -I -z -E "" | _archive_filter | _value_filter
97-
echo "---"
98+
echo "--- -a archives/rep -H -I -Z UTC+0 -x \"\""
9899
pcp2json -a $A -H -I -Z UTC+0 -x "" | _archive_filter
99-
echo "---"
100+
echo "--- pcp2json -a archives/rep -H -I -z -X -b GB -P 2 -F TMP.outfile \"\""
100101
pcp2json -a $A -H -I -z -X -b GB -P 2 -F $tmp.outfile ""
101-
echo "---"
102+
echo "--- pcp2openmetrics -s1 -z hinv.ncpu"
102103
pcp2openmetrics -s1 -z hinv.ncpu | _filter_pcp2openmetrics
103-
echo "---"
104+
echo "--- pcp2openmetrics -s2 -x hinv.ncpu"
104105
pcp2openmetrics -s2 -x hinv.ncpu | _filter_pcp2openmetrics
105-
echo "---"
106+
echo "--- pcp2openmetrics -s2 -a archives/20201109 hinv.ncpu kernel.all.load"
106107
pcp2openmetrics -s2 -a $A1 hinv.ncpu kernel.all.load | _filter_pcp2openmetrics | _archive_filter
107-
echo "---"
108+
echo "--- pcp2opentelemetry -s1 -z hinv.ncpu"
108109
pcp2opentelemetry -s1 -z hinv.ncpu | _filter_pcp2opentelemetry
109-
echo "---"
110+
echo "--- pcp2opentelemetry -s2 -z hinv.ncpu"
110111
pcp2opentelemetry -s2 -z hinv.ncpu | _filter_pcp2opentelemetry
111-
echo "---"
112+
echo "--- pcp2opentelemetry -s1 -a archives/20201109 hinv.ncpu"
112113
pcp2opentelemetry -s1 -a $A1 hinv.ncpu | _filter_pcp2opentelemetry
113114
echo "---"
114115

0 commit comments

Comments
 (0)