Skip to content

Commit 7731417

Browse files
committed
initial ci cleanup
1 parent 07958bd commit 7731417

14 files changed

+12
-443
lines changed

.github/workflows/ci.yml

Lines changed: 12 additions & 115 deletions
Original file line numberDiff line numberDiff line change
@@ -87,17 +87,8 @@ jobs:
8787
run: |
8888
python -m pip install boto3
8989
mvn install -DskipTests
90-
- name: configure AWS credentials (PubSub)
91-
uses: aws-actions/configure-aws-credentials@v2
92-
with:
93-
role-to-assume: ${{ env.CI_PUBSUB_ROLE }}
94-
aws-region: ${{ env.AWS_DEFAULT_REGION }}
95-
- name: run PubSub sample
96-
run: |
97-
python ./utils/run_in_ci.py --file ./.github/workflows/ci_run_pubsub_cfg.json
98-
- name: run Windows Certificate Connect sample
99-
run: |
100-
python ./utils/run_in_ci.py --file ./.github/workflows/ci_run_windows_cert_connect_cfg.json
90+
91+
# MAYBE REMOVE
10192
- name: configure AWS credentials (MQTT5)
10293
uses: aws-actions/configure-aws-credentials@v2
10394
with:
@@ -106,6 +97,8 @@ jobs:
10697
- name: run MQTT5 PubSub sample
10798
run: |
10899
python3 ./utils/run_in_ci.py --file ./.github/workflows/ci_run_mqtt5_pubsub_cfg.json
100+
# REMOVE ABOVE
101+
109102
- name: configure AWS credentials (Device Advisor)
110103
uses: aws-actions/configure-aws-credentials@v2
111104
with:
@@ -168,23 +161,8 @@ jobs:
168161
source .venv/bin/activate
169162
python3 -m pip install boto3
170163
mvn install -Dmaven.test.skip=true
171-
- name: configure AWS credentials (PubSub)
172-
uses: aws-actions/configure-aws-credentials@v2
173-
with:
174-
role-to-assume: ${{ env.CI_PUBSUB_ROLE }}
175-
aws-region: ${{ env.AWS_DEFAULT_REGION }}
176-
- name: run PubSub sample
177-
run: |
178-
source .venv/bin/activate
179-
python3 ./utils/run_in_ci.py --file ./.github/workflows/ci_run_pubsub_cfg.json
180-
- name: run PKCS12 Connect sample
181-
run: |
182-
cert=$(aws secretsmanager get-secret-value --region us-east-1 --secret-id "ci/PubSub/cert" --query "SecretString" | cut -f2 -d":" | cut -f2 -d\") && echo -e "$cert" > /tmp/certificate.pem
183-
key=$(aws secretsmanager get-secret-value --region us-east-1 --secret-id "ci/PubSub/key" --query "SecretString" | cut -f2 -d":" | cut -f2 -d\") && echo -e "$key" > /tmp/privatekey.pem
184-
pkcs12_password=$(aws secretsmanager get-secret-value --region us-east-1 --secret-id "ci/PubSub/key_pkcs12_password" --query "SecretString" | cut -f2 -d":" | cut -f2 -d\")
185-
openssl pkcs12 -export -in /tmp/certificate.pem -inkey /tmp/privatekey.pem -out ./pkcs12-key.p12 -name PubSub_Thing_Alias -password pass:$pkcs12_password
186-
source .venv/bin/activate
187-
python3 ./utils/run_in_ci.py --file ./.github/workflows/ci_run_pkcs12_connect_cfg.json
164+
165+
# MAYBE REMOVE
188166
- name: configure AWS credentials (MQTT5)
189167
uses: aws-actions/configure-aws-credentials@v2
190168
with:
@@ -194,6 +172,8 @@ jobs:
194172
run: |
195173
source .venv/bin/activate
196174
python3 ./utils/run_in_ci.py --file ./.github/workflows/ci_run_mqtt5_pubsub_cfg.json
175+
# REMOVE ABOVE
176+
197177
- name: configure AWS credentials (Device Advisor)
198178
uses: aws-actions/configure-aws-credentials@v2
199179
with:
@@ -254,14 +234,8 @@ jobs:
254234
- name: Running samples in CI setup
255235
run: |
256236
python3 -m pip install boto3
257-
- name: configure AWS credentials (PubSub)
258-
uses: aws-actions/configure-aws-credentials@v2
259-
with:
260-
role-to-assume: ${{ env.CI_PUBSUB_ROLE }}
261-
aws-region: ${{ env.AWS_DEFAULT_REGION }}
262-
- name: run PubSub sample
263-
run: |
264-
python3 ./utils/run_in_ci.py --file ./.github/workflows/ci_run_pubsub_cfg.json
237+
238+
# MAYBE REMOVE
265239
- name: configure AWS credentials (MQTT5)
266240
uses: aws-actions/configure-aws-credentials@v2
267241
with:
@@ -270,6 +244,8 @@ jobs:
270244
- name: run MQTT5 PubSub sample
271245
run: |
272246
python3 ./utils/run_in_ci.py --file ./.github/workflows/ci_run_mqtt5_pubsub_cfg.json
247+
# REMOVE ABOVE
248+
273249
- name: configure AWS credentials (Device Advisor)
274250
uses: aws-actions/configure-aws-credentials@v2
275251
with:
@@ -486,94 +462,15 @@ jobs:
486462
run: |
487463
export PYTHONPATH=${{ github.workspace }}/utils
488464
python3 ./test_cases/test_jobs_execution.py --mqtt-version 5
489-
- name: configure AWS credentials (Connect and PubSub)
490-
uses: aws-actions/configure-aws-credentials@v2
491-
with:
492-
role-to-assume: ${{ env.CI_PUBSUB_ROLE }}
493-
aws-region: ${{ env.AWS_DEFAULT_REGION }}
494-
- name: run Basic Connect sample
495-
run: |
496-
python3 ./utils/run_in_ci.py --file ./.github/workflows/ci_run_basic_connect_cfg.json
497-
- name: run Websocket Connect sample
498-
run: |
499-
python3 ./utils/run_in_ci.py --file ./.github/workflows/ci_run_websocket_connect_cfg.json
500-
- name: run PubSub sample
501-
run: |
502-
python3 ./utils/run_in_ci.py --file ./.github/workflows/ci_run_pubsub_cfg.json
503-
- name: run CustomKeyOperations sample
504-
run: |
505-
python3 ./utils/run_in_ci.py --file ./.github/workflows/ci_run_custom_key_ops_cfg.json
506-
- name: run PKCS11 Connect sample
507-
run: |
508-
mkdir -p /tmp/tokens
509-
export SOFTHSM2_CONF=/tmp/softhsm2.conf
510-
echo "directories.tokendir = /tmp/tokens" > /tmp/softhsm2.conf
511-
python3 ./utils/run_in_ci.py --file ./.github/workflows/ci_run_pkcs11_connect_cfg.json
512-
- name: run Java keystore Connect sample
513-
run: |
514-
cert=$(aws secretsmanager get-secret-value --region us-east-1 --secret-id "ci/PubSub/cert" --query "SecretString" | cut -f2 -d":" | cut -f2 -d\") && echo -e "$cert" > /tmp/certificate.pem
515-
key=$(aws secretsmanager get-secret-value --region us-east-1 --secret-id "ci/PubSub/key" --query "SecretString" | cut -f2 -d":" | cut -f2 -d\") && echo -e "$key" > /tmp/privatekey.pem
516-
pkcs12_password=$(aws secretsmanager get-secret-value --region us-east-1 --secret-id "ci/PubSub/key_pkcs12_password" --query "SecretString" | cut -f2 -d":" | cut -f2 -d\")
517-
openssl pkcs12 -export -in /tmp/certificate.pem -inkey /tmp/privatekey.pem -out /tmp/pkcs12-key.p12 -name PubSub_Thing_Alias -password pass:$pkcs12_password
518-
keytool -importkeystore -srckeystore /tmp/pkcs12-key.p12 -destkeystore ./java_keystore.keys -srcstoretype PKCS12 -alias PubSub_Thing_Alias -srcstorepass $pkcs12_password -deststorepass $pkcs12_password
519-
python3 ./utils/run_in_ci.py --file ./.github/workflows/ci_run_keystore_connect_cfg.json
520-
- name: configure AWS credentials (Cognito)
521-
uses: aws-actions/configure-aws-credentials@v2
522-
with:
523-
role-to-assume: ${{ env.CI_COGNITO_ROLE }}
524-
aws-region: ${{ env.AWS_DEFAULT_REGION }}
525-
- name: run CognitoConnect sample
526-
run: |
527-
python3 ./utils/run_in_ci.py --file ./.github/workflows/ci_run_cognito_connect_cfg.json
528-
- name: configure AWS credentials (Custom Authorizer)
529-
uses: aws-actions/configure-aws-credentials@v2
530-
with:
531-
role-to-assume: ${{ env.CI_CUSTOM_AUTHORIZER_ROLE }}
532-
aws-region: ${{ env.AWS_DEFAULT_REGION }}
533-
- name: run CustomAuthorizerConnect sample
534-
run: |
535-
python3 ./utils/run_in_ci.py --file ./.github/workflows/ci_run_custom_authorizer_connect_cfg.json
536-
- name: configure AWS credentials (Shadow)
537-
uses: aws-actions/configure-aws-credentials@v2
538-
with:
539-
role-to-assume: ${{ env.CI_SHADOW_ROLE }}
540-
aws-region: ${{ env.AWS_DEFAULT_REGION }}
541-
- name: run Shadow sample
542-
run: |
543-
python3 ./utils/run_in_ci.py --file ./.github/workflows/ci_run_shadow_cfg.json
544465
- name: run Mqtt5 Shadow sample
545466
run: |
546467
python3 ./utils/run_in_ci.py --file ./.github/workflows/ci_run_shadow_mqtt5_cfg.json
547-
- name: configure AWS credentials (Jobs)
548-
uses: aws-actions/configure-aws-credentials@v2
549-
with:
550-
role-to-assume: ${{ env.CI_JOBS_ROLE }}
551-
aws-region: ${{ env.AWS_DEFAULT_REGION }}
552-
- name: run Jobs sample
553-
run: |
554-
python3 ./utils/run_in_ci.py --file ./.github/workflows/ci_run_jobs_cfg.json
555468
- name: run Mqtt5 Jobs sample
556469
run: |
557470
python3 ./utils/run_in_ci.py --file ./.github/workflows/ci_run_jobs_mqtt5_cfg.json
558-
- name: configure AWS credentials (Fleet provisioning)
559-
uses: aws-actions/configure-aws-credentials@v2
560-
with:
561-
role-to-assume: ${{ env.CI_FLEET_PROVISIONING_ROLE }}
562-
aws-region: ${{ env.AWS_DEFAULT_REGION }}
563-
- name: run Fleet Provisioning sample
564-
run: |
565-
python3 ./utils/run_fleet_provisioning_sample.py --file ./.github/workflows/ci_run_fleet_provisioning_cfg.json --thing-name-prefix "Fleet_Thing_"
566471
- name: run Mqtt5 Fleet Provisioning sample
567472
run: |
568473
python3 ./utils/run_fleet_provisioning_sample.py --file ./.github/workflows/ci_run_fleet_provisioning_mqtt5_cfg.json --thing-name-prefix "Fleet_Thing_"
569-
- name: configure AWS credentials (X509)
570-
uses: aws-actions/configure-aws-credentials@v2
571-
with:
572-
role-to-assume: ${{ env.CI_X509_ROLE }}
573-
aws-region: ${{ env.AWS_DEFAULT_REGION }}
574-
- name: run X509 sample
575-
run: |
576-
python3 ./utils/run_in_ci.py --file ./.github/workflows/ci_run_x509_connect_cfg.json
577474
- name: configure AWS credentials (MQTT5)
578475
uses: aws-actions/configure-aws-credentials@v2
579476
with:

.github/workflows/ci_run_basic_connect_cfg.json

Lines changed: 0 additions & 22 deletions
This file was deleted.

.github/workflows/ci_run_cognito_connect_cfg.json

Lines changed: 0 additions & 20 deletions
This file was deleted.

.github/workflows/ci_run_custom_authorizer_connect_cfg.json

Lines changed: 0 additions & 20 deletions
This file was deleted.

.github/workflows/ci_run_custom_key_ops_cfg.json

Lines changed: 0 additions & 22 deletions
This file was deleted.

.github/workflows/ci_run_jobs_cfg.json

Lines changed: 0 additions & 26 deletions
This file was deleted.

.github/workflows/ci_run_keystore_connect_cfg.json

Lines changed: 0 additions & 32 deletions
This file was deleted.

.github/workflows/ci_run_pkcs11_connect_cfg.json

Lines changed: 0 additions & 39 deletions
This file was deleted.

.github/workflows/ci_run_pkcs12_connect_cfg.json

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)