Skip to content

Commit 73ee89e

Browse files
authored
fix: pass keys to ci post-merge job (#1056)
1 parent 3318101 commit 73ee89e

File tree

5 files changed

+28
-10
lines changed

5 files changed

+28
-10
lines changed

.github/actions/tests/run-e2e-tests/action.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,10 @@ runs:
111111
source venv/bin/activate
112112
eval "$pytest_cmd"
113113
fi
114+
env:
115+
AWS_SESSION_TOKEN: ${{ env.AWS_SESSION_TOKEN }}
116+
AWS_ACCESS_KEY_ID: ${{ env.AWS_ACCESS_KEY_ID }}
117+
AWS_SECRET_ACCESS_KEY: ${{ env.AWS_SECRET_ACCESS_KEY }}
114118

115119
- name: Copy test results
116120
if: ${{ inputs.local-environment == 'true' }}

.github/workflows/ci.yml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@ on:
1616
required: false
1717
type: boolean
1818
default: false
19+
run_post_merge_tests:
20+
description: 'Run post-merge tests'
21+
required: false
22+
type: boolean
23+
default: false
1924

2025
env:
2126
AWS_REGION: "eu-central-1"
@@ -838,10 +843,15 @@ jobs:
838843
K8S_SA_TOKEN: ${{ secrets.K8S_SA_TOKEN }}
839844

840845
ci-preview-tests-post-merge:
841-
if: github.event_name == 'pull_request' && github.event.pull_request.merged == true
846+
if: (github.event_name == 'pull_request' && github.event.pull_request.merged == true) || (github.event_name == 'workflow_dispatch' && inputs.run_post_merge_tests == true)
842847
needs: deploy-ci-preview
843848
runs-on: eks
844849
steps:
850+
- name: Acquire AWS credentials
851+
uses: aws-actions/configure-aws-credentials@v4
852+
with:
853+
role-to-assume: ${{ secrets.AWS_ROLE_ARN_SECRET }}
854+
aws-region: ${{ env.AWS_REGION }}
845855
- name: Checkout
846856
uses: actions/checkout@v4
847857
with:
@@ -860,6 +870,10 @@ jobs:
860870
env: ci
861871
decrypt: true
862872
blockchain: substrate
873+
env:
874+
AWS_SESSION_TOKEN: ${{ env.AWS_SESSION_TOKEN }}
875+
AWS_ACCESS_KEY_ID: ${{ env.AWS_ACCESS_KEY_ID }}
876+
AWS_SECRET_ACCESS_KEY: ${{ env.AWS_SECRET_ACCESS_KEY }}
863877

864878
post-merge-actions-complete:
865879
if: ${{ always() && (github.event_name == 'pull_request' && github.event.pull_request.merged == true) }}

e2e-tests/secrets/substrate/ci/ci.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"dbSync": {
1212
"type": "ENC[AES256_GCM,data:rU0LSPIX73kqWg==,iv:5qktowdBAl59uNXVrmwI2mil7Thh4SDEQOzHLylBsEA=,tag:a5RNbDEZNqzw/kSye6LFTg==,type:str]",
1313
"username": "ENC[AES256_GCM,data:1eTHUrdrcLs=,iv:l6QgW8p1xMajlWKu4RK4PYo/QIHiqfQJzzqO7PrDgAs=,tag:7ETwkCcENCngxwKE1LVvXw==,type:str]",
14-
"password": "ENC[AES256_GCM,data:oVlgGHpnHIB0+J8=,iv:gmC701ZgCsg7byHM1WEEcjTQ54zlRWDyUjrARkUQKXk=,tag:ErikySOEnv7IqrSxYlkN2A==,type:str]",
14+
"password": "ENC[AES256_GCM,data:z5dum6wRIkwWjhqODGYLNSx5A1OOp+OI0thiytJ9gI0=,iv:ZDgMAniQzC3YyF6Eonsa90JP9gTMvqFtk0OESIBojgc=,tag:tcmcc1a7Kam4qtp8QDzsSw==,type:str]",
1515
"host": "ENC[AES256_GCM,data:RWW4LTO8VrYa,iv:bgrmMUIuzBdLkqd9nUEaa4HW2yu6LFy4YXnzTIn/BaU=,tag:W9RCLCyIukYwV0A+CcJvtg==,type:str]",
1616
"port": "ENC[AES256_GCM,data:WUTE0w==,iv:S8fwURTz2InT0lniggKwzPK9xkUrCtd3hedURQMfs/U=,tag:g7xe9rII1vxTUUEASVRixw==,type:str]",
1717
"name": "ENC[AES256_GCM,data:PHGEXKkMInKO,iv:AgI9EIiGUm9HL9bwnVN8VQPglTaSoV9cL13wTUK+GRo=,tag:QdIqJIDmltKUZTgG8Qup+Q==,type:str]",
@@ -97,8 +97,8 @@
9797
"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBJMmR6ZldRUmRHQno5akQ4\nODNUZy8ya3JlSzZscTJGWGV2VUg4U0JyYzBBClVwT0U4KzIydFpBWkExRldMK1RV\nT3RpZ3h0OE1NRHBOZlc5ZEdaV3hQMHMKLS0tIHc1dDZMUnRIc3RBdkxEeHNGSW5S\nSk9hNGVkdE1leWc1TFp1ejQ2QmNBZG8KnyRjGoPSH/+kVXFmIcE30nQi0KAxVwEC\n2KIMfmObtyY8oLLv1uxRyXa4sPu18rOVvNRSWyaFMU1sonDaGFIyNA==\n-----END AGE ENCRYPTED FILE-----\n"
9898
}
9999
],
100-
"lastmodified": "2025-10-09T08:30:13Z",
101-
"mac": "ENC[AES256_GCM,data:H60ZFZtRqXbgO/Ts3ZKaXNHV7sHTuNzKkgJILs0XO1NM7RKV7rF8G3UbpcTFV925SrDw6MFxn4niEmXgkQ2RZ0yd5AKZxR7V33CXphCFDxU1SAvF8MFuSbXxejqz4DQ/kissBARF/W74ackKAPKHMiE3kV7UJ03f9ttKp+gGPYM=,iv:8iCSTIv+GlWRpjD8pKy5mXjV3KyVmseh1FdOsKEM3M8=,tag:6MLWqLvSeWpXumAO4mm4sA==,type:str]",
100+
"lastmodified": "2025-10-13T09:40:25Z",
101+
"mac": "ENC[AES256_GCM,data:FqLIpkf/kxOQ5OWlT8ZkN6d7jh5NRTq8u7lmgNQoGwTYSGj6i1pxfBx+V1izV1N9k040KmK0oSOTa5RMDFWhJBA8CUVUPdW83OuhB/4a7aHRYsgDaXyjp8vsEBQnDHjqutcbm3AX9AWq0YtxyPiNFzOhDTkiaS9g9AgksRTprfw=,iv:yMWaHy1mI4U4FveE+Y7iRhieCFPAWzj4LvUKxFd7Hdg=,tag:XcWE3wx5dEtdnYZBKpJMag==,type:str]",
102102
"pgp": [
103103
{
104104
"created_at": "2025-08-27T21:04:59Z",

e2e-tests/secrets/substrate/devnet/devnet.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"dbSync": {
1212
"type": "ENC[AES256_GCM,data:rU0LSPIX73kqWg==,iv:5qktowdBAl59uNXVrmwI2mil7Thh4SDEQOzHLylBsEA=,tag:a5RNbDEZNqzw/kSye6LFTg==,type:str]",
1313
"username": "ENC[AES256_GCM,data:1eTHUrdrcLs=,iv:l6QgW8p1xMajlWKu4RK4PYo/QIHiqfQJzzqO7PrDgAs=,tag:7ETwkCcENCngxwKE1LVvXw==,type:str]",
14-
"password": "ENC[AES256_GCM,data:R3U9gAiHkcOOhHA=,iv:etASXgPaldCKj0cEFWEWpkZ/VxmNh0AOGNnVOMA7U58=,tag:qyhpDfpMFbDAsdFpO97fAQ==,type:str]",
14+
"password": "ENC[AES256_GCM,data:FwPS16c/nYsgkJ+2DynMKXCBFDWpQOLBKjJI6Vu6o9U=,iv:ekJkribka3CF0CiEDcPE/FXDvMIgLKV0+pmwwq6VtZ0=,tag:xfnEOqyU57lKFlqCX7lSYw==,type:str]",
1515
"host": "ENC[AES256_GCM,data:sHpdg7ZSl623,iv:V5W4rIVzIZ49J3nAhKizKZym6NRhRbsyq2zmm5NY92E=,tag:UIkQ33CRfyLiMMozIFLmHg==,type:str]",
1616
"port": "ENC[AES256_GCM,data:ifcwrg==,iv:XXa0UwrKhvGvSuWQidcZj5byT/00CyEd5e2yiqUHlDA=,tag:L/X5kW0RWE20nBXr0vo8Vw==,type:str]",
1717
"name": "ENC[AES256_GCM,data:PHGEXKkMInKO,iv:AgI9EIiGUm9HL9bwnVN8VQPglTaSoV9cL13wTUK+GRo=,tag:QdIqJIDmltKUZTgG8Qup+Q==,type:str]",
@@ -60,8 +60,8 @@
6060
"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBybkJQQTlGMGxBQ3IyT29I\nR3JmWkJtVG10T2lHdjFkTmxSc2Z3cnJ5a0drClJuMzBEeEJ1UHp6b0JuL0M3YVp2\nckxUWEpMM29kSUFkK1llMlZFT0lwQUkKLS0tIGhDLytTWVRNbVd6elhVTTdzcEVh\nbWoxR3lvOVVXL0JubVMvelpvaFFEWUEK8lw48AV+UMo0+HYdDgfCWVemGSCduUnT\n7p7l0yLjm6SO0yZfD3PabknSS9DLhpvHizZcCHk3AoqdWZ6IIGJcRw==\n-----END AGE ENCRYPTED FILE-----\n"
6161
}
6262
],
63-
"lastmodified": "2025-10-09T08:31:18Z",
64-
"mac": "ENC[AES256_GCM,data:w6+PCUZ9gBlOL/cA3j304hzrcDg/85olXl51oTiAxU9n9JIbSt2/y7yGmgwudxx0Vm+a3CHIIsbJJzDRF4iKFioWxYM5NxQqgNUGLkiajpNf53JXU8T1AFx56M6gWyF7Jh0x3IL7cgqL/PmZzvDlqn6HwtlohyGaaef0HsTku2A=,iv:TP3W/VETT3xQJSEdGZTeyrMZR5DLIiSd14aF87Stfb8=,tag:R2ZMwd3s2rIYveg8VTqP8A==,type:str]",
63+
"lastmodified": "2025-10-13T09:40:31Z",
64+
"mac": "ENC[AES256_GCM,data:g4KY6zIPbSfRGsr8ux7F0S1bzJd0Mf9nWIt4p/Deg7kLJk1KXxBPN4Gt/v6zPs0Ju8xZ3RWTFvTMQip88hAylVvOYEmHRaJiagZ2ypTPQb54MU5S5HAV7zvwry6M2GL7mHU7O/s6AyFfr41XrW+jGZZ94ar2IyCH2eKOs3nrxKU=,iv:pve9AkuA8yV6fdbICKZ4Frln/pgW1lMTMOigaN+DftY=,tag:UQsbJd/MoWGU28dsa1/NyQ==,type:str]",
6565
"pgp": [
6666
{
6767
"created_at": "2025-08-27T21:05:00Z",

e2e-tests/secrets/substrate/staging/staging.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"dbSync": {
1212
"type": "ENC[AES256_GCM,data:rU0LSPIX73kqWg==,iv:5qktowdBAl59uNXVrmwI2mil7Thh4SDEQOzHLylBsEA=,tag:a5RNbDEZNqzw/kSye6LFTg==,type:str]",
1313
"username": "ENC[AES256_GCM,data:1eTHUrdrcLs=,iv:l6QgW8p1xMajlWKu4RK4PYo/QIHiqfQJzzqO7PrDgAs=,tag:7ETwkCcENCngxwKE1LVvXw==,type:str]",
14-
"password": "ENC[AES256_GCM,data:oVlgGHpnHIB0+J8=,iv:gmC701ZgCsg7byHM1WEEcjTQ54zlRWDyUjrARkUQKXk=,tag:ErikySOEnv7IqrSxYlkN2A==,type:str]",
14+
"password": "ENC[AES256_GCM,data:CQ/SpNI1bZ648VQ985jkj8g0xpdlOqT/7fKktdcm2ns=,iv:t7vp/vOwEdm44nhcFtfQGF4sJWDtjdIBSiV/7J7fCKc=,tag:K2XidTYJ9E3d9ZzhB449JA==,type:str]",
1515
"host": "ENC[AES256_GCM,data:opeeX6GmQJW6,iv:DbwCj3xJcYrE82FuuOL5QgSmzTzDccBHdA1y0hMn30Y=,tag:u+avHftrIP2XKhCV5y5YBA==,type:str]",
1616
"port": "ENC[AES256_GCM,data:WUTE0w==,iv:S8fwURTz2InT0lniggKwzPK9xkUrCtd3hedURQMfs/U=,tag:g7xe9rII1vxTUUEASVRixw==,type:str]",
1717
"name": "ENC[AES256_GCM,data:PHGEXKkMInKO,iv:AgI9EIiGUm9HL9bwnVN8VQPglTaSoV9cL13wTUK+GRo=,tag:QdIqJIDmltKUZTgG8Qup+Q==,type:str]",
@@ -97,8 +97,8 @@
9797
"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBwRmxZYzRLcGptTmZuUmZn\ndFFFUjh1aFFZY0ZqNHNOY0k3cGRSWXlpaUJrCkxuRE5idmZwdFk0SEJRWTA0K2JB\nOHVCc0tKOCtocTRXSit1QkNqY3FCUjQKLS0tIHRIWTVaak5HRFBxdDhrcUxsZlJo\nWWxXSGluYjN3SW03SUJ4bkRjYlpsM0kKd4vLRcszXH/Yv/BDlixvFhk3PoL7jrxJ\nJuRwBYwALNY0qULCZJ9B8+jFo9k5qUBTGJkE7UNhNizU84sLat+98g==\n-----END AGE ENCRYPTED FILE-----\n"
9898
}
9999
],
100-
"lastmodified": "2025-10-09T08:33:17Z",
101-
"mac": "ENC[AES256_GCM,data:thd4fNe9cD5nBHrA8UKjS5AwFjtsAfN/JMFa7aGxoNxJa2qWbIP0uteAFkqZjzPOslHz+eXjiKhoFuuyRkIFVyLmhBAHWy/+WEwwDA2E3IkbbW8ijJ8XYSEvry7ZzDGX1tpwO12xV2936lP0VbcnVbzYuUF7PxKNXILoHhe+swY=,iv:oC6ndu+9LCol7zH79yrsoRABZotlfCuEbSu5jCvjWus=,tag:FGn1or9bRk4KKNWtIqFGzw==,type:str]",
100+
"lastmodified": "2025-10-13T09:40:47Z",
101+
"mac": "ENC[AES256_GCM,data:Z9Q3Zz+Pp7pwKqr/vlu3lICzWZLxIydR7ga9/xqV4xfCSq6gcw5vp39aAbsa0hB80pwNCAEAauzzfTsBsB8BxstujTiSLILT9wsOsKUTzgbM0LocFOYVbG0xtDQCYmR/tpEqPRHFIndrsvW1MiiO8YYMPgwY4KkvR0d+1XmLrK4=,iv:kOUIvG7RMD0ltKl9T0Aj5VcT2GT3GpFHjxzOtPl2nrY=,tag:u6xVYGlPvvqcO/QL7Awf/w==,type:str]",
102102
"pgp": [
103103
{
104104
"created_at": "2025-08-27T21:07:18Z",

0 commit comments

Comments
 (0)