Skip to content

Commit 308c86a

Browse files
artemgavrilovartemgavrilov
committed
Try
1 parent 3ae7445 commit 308c86a

File tree

2 files changed

+73
-78
lines changed

2 files changed

+73
-78
lines changed

‎.github/workflows/psp-reusable.yml

Lines changed: 72 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -67,87 +67,83 @@ jobs:
6767
- name: Downgrade python to 3.11
6868
uses: actions/setup-python@v5
6969
with:
70-
python-version: '3.10-dev'
70+
python-version: '3.11-dev'
7171

7272
- name: Install dependencies
7373
run: src/ci_scripts/ubuntu-deps.sh
7474

75-
- name: Install python dependencies
76-
run: |
77-
pip install cryptography
78-
pip install pykmip
79-
80-
- name: Debuf
81-
run: |
82-
python3 --version
75+
- name: Setup kmip and vault
76+
run: src/ci_scripts/setup-keyring-servers.sh
77+
78+
- name: Test postgres
79+
run: src/ci_scripts/${{ inputs.build_script }}-test.sh all
80+
81+
- name: Report on test fail
82+
uses: actions/upload-artifact@v4
83+
if: ${{ failure() }}
84+
with:
85+
name: log-test-${{ inputs.os }}-${{ inputs.compiler }}-${{ inputs.build_script }}-${{ inputs.build_type }}
86+
path: |
87+
src/build/testrun
88+
src/contrib/*/log
89+
src/contrib/*/regression.diffs
90+
src/contrib/*/regression.out
91+
src/contrib/*/results
92+
src/contrib/*/tmp_check
93+
src/contrib/*/t/results
94+
src/src/test/*/log
95+
src/src/test/*/regression.diffs
96+
src/src/test/*/regression.out
97+
src/src/test/*/results
98+
src/src/test/*/tmp_check
99+
retention-days: 3
100+
101+
test_tde:
102+
name: Test PSP with TDE
103+
runs-on: ${{ inputs.os }}
104+
if: inputs.build_script == 'make'
105+
needs: build
106+
107+
steps:
108+
- name: Download build artifacts
109+
uses: actions/download-artifact@v4
110+
with:
111+
name: ${{ env.artifact_name }}
112+
path: .
113+
114+
- name: Extract artifact file
115+
run: tar -xzf artifacts.tar
116+
117+
- name: Downgrade python to 3.11
118+
uses: actions/setup-python@v5
119+
with:
120+
python-version: '3.11-dev'
121+
122+
- name: Install dependencies
123+
run: src/ci_scripts/ubuntu-deps.sh
83124

84125
- name: Setup kmip and vault
85126
run: src/ci_scripts/setup-keyring-servers.sh
86127

87-
# - name: Test postgres
88-
# run: src/ci_scripts/${{ inputs.build_script }}-test.sh all
89-
90-
# - name: Report on test fail
91-
# uses: actions/upload-artifact@v4
92-
# if: ${{ failure() }}
93-
# with:
94-
# name: log-test-${{ inputs.os }}-${{ inputs.compiler }}-${{ inputs.build_script }}-${{ inputs.build_type }}
95-
# path: |
96-
# src/build/testrun
97-
# src/contrib/*/log
98-
# src/contrib/*/regression.diffs
99-
# src/contrib/*/regression.out
100-
# src/contrib/*/results
101-
# src/contrib/*/tmp_check
102-
# src/contrib/*/t/results
103-
# src/src/test/*/log
104-
# src/src/test/*/regression.diffs
105-
# src/src/test/*/regression.out
106-
# src/src/test/*/results
107-
# src/src/test/*/tmp_check
108-
# retention-days: 3
109-
110-
# test_tde:
111-
# name: Test PSP with TDE
112-
# runs-on: ${{ inputs.os }}
113-
# if: inputs.build_script == 'make'
114-
# needs: build
115-
116-
# steps:
117-
# - name: Download build artifacts
118-
# uses: actions/download-artifact@v4
119-
# with:
120-
# name: ${{ env.artifact_name }}
121-
# path: .
122-
123-
# - name: Extract artifact file
124-
# run: tar -xzf artifacts.tar
125-
126-
# - name: Install dependencies
127-
# run: src/ci_scripts/ubuntu-deps.sh
128-
129-
# - name: Setup kmip and vault
130-
# run: src/ci_scripts/setup-keyring-servers.sh
131-
132-
# - name: Test postgres with TDE as default access method
133-
# run: src/ci_scripts/${{ inputs.build_script }}-test-global-tde.sh --continue
134-
135-
# - name: Report on test fail
136-
# uses: actions/upload-artifact@v4
137-
# if: ${{ failure() }}
138-
# with:
139-
# name: log-test-global-tde-${{ inputs.os }}-${{ inputs.compiler }}-${{ inputs.build_script }}-${{ inputs.build_type }}
140-
# path: |
141-
# src/build/testrun
142-
# src/contrib/*/log
143-
# src/contrib/*/regression.diffs
144-
# src/contrib/*/regression.out
145-
# src/contrib/*/results
146-
# src/contrib/*/tmp_check
147-
# src/contrib/*/t/results
148-
# src/src/test/*/log
149-
# src/src/test/*/regression.diffs
150-
# src/src/test/*/regression.out
151-
# src/src/test/*/results
152-
# src/src/test/*/tmp_check
153-
# retention-days: 3
128+
- name: Test postgres with TDE as default access method
129+
run: src/ci_scripts/${{ inputs.build_script }}-test-global-tde.sh --continue
130+
131+
- name: Report on test fail
132+
uses: actions/upload-artifact@v4
133+
if: ${{ failure() }}
134+
with:
135+
name: log-test-global-tde-${{ inputs.os }}-${{ inputs.compiler }}-${{ inputs.build_script }}-${{ inputs.build_type }}
136+
path: |
137+
src/build/testrun
138+
src/contrib/*/log
139+
src/contrib/*/regression.diffs
140+
src/contrib/*/regression.out
141+
src/contrib/*/results
142+
src/contrib/*/tmp_check
143+
src/contrib/*/t/results
144+
src/src/test/*/log
145+
src/src/test/*/regression.diffs
146+
src/src/test/*/regression.out
147+
src/src/test/*/results
148+
src/src/test/*/tmp_check
149+
retention-days: 3

‎ci_scripts/ubuntu-deps.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ DEPS=(
4040
# Test
4141
libipc-run-perl
4242
# Test pg_tde
43-
python3-pykmip
4443
libhttp-server-simple-perl
4544
lcov
4645
# Run pgperltidy
@@ -51,7 +50,7 @@ sudo apt-get update
5150
sudo apt-get install -y ${DEPS[@]}
5251

5352
sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)"
54-
pip3 install meson
53+
pip3 install meson pykmip cryptography
5554

5655
# Vault
5756
wget -O - https://apt.releases.hashicorp.com/gpg | sudo tee /etc/apt/keyrings/hashicorp-archive-keyring.asc

0 commit comments

Comments
 (0)