Skip to content

Commit f406fe4

Browse files
kyteinskykyteinsky
committed
ci: fix harp deploy tests
Signed-off-by: Anupam Kumar <[email protected]>
1 parent 57d26dc commit f406fe4

File tree

1 file changed

+70
-60
lines changed

1 file changed

+70
-60
lines changed

‎.github/workflows/tests-deploy.yml‎

Lines changed: 70 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -994,6 +994,11 @@ jobs:
994994
- name: Set app env
995995
run: echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
996996

997+
- name: Checkout AppAPI
998+
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
999+
with:
1000+
path: apps/${{ env.APP_NAME }}
1001+
9971002
- name: Create containers
9981003
run: |
9991004
docker network create master_bridge
@@ -1004,12 +1009,12 @@ jobs:
10041009
-v /var/run/docker.sock:/var/run/docker.sock \
10051010
--net master_bridge --name appapi-harp -h appapi-harp \
10061011
--restart unless-stopped \
1007-
--rm -d ghcr.io/nextcloud/nextcloud-appapi-harp:latest
1012+
-d ghcr.io/nextcloud/nextcloud-appapi-harp:latest
10081013
docker run --net master_bridge --name nextcloud-docker --rm -d ${{ env.docker-image }}
1009-
sed -i 's/127\.0\.0\.1:8080/nextcloud-docker/' /var/www/html/apps/${{ env.APP_NAME }}/tests/simple-nginx-NOT-FOR-PRODUCTION.conf'
1010-
sed -i 's/127\.0\.0\.1:8780/appapi-harp:8780/' /var/www/html/apps/${{ env.APP_NAME }}/tests/simple-nginx-NOT-FOR-PRODUCTION.conf'
1014+
sed -i 's/127\.0\.0\.1:8080/nextcloud-docker/' apps/${{ env.APP_NAME }}/tests/simple-nginx-NOT-FOR-PRODUCTION.conf'
1015+
sed -i 's/127\.0\.0\.1:8780/appapi-harp:8780/' apps/${{ env.APP_NAME }}/tests/simple-nginx-NOT-FOR-PRODUCTION.conf'
10111016
docker run --net master_bridge --name nextcloud --rm -d nginx \
1012-
-v /var/www/html/apps/${{ env.APP_NAME }}/tests/simple-nginx-NOT-FOR-PRODUCTION.conf:/etc/nginx/conf.d/default.conf:ro \
1017+
-v apps/${{ env.APP_NAME }}/tests/simple-nginx-NOT-FOR-PRODUCTION.conf:/etc/nginx/conf.d/default.conf:ro \
10131018
sleep 60s
10141019
10151020
- name: Install AppAPI
@@ -1028,8 +1033,8 @@ jobs:
10281033
- name: Registering and enabling Skeleton ExApp
10291034
run: |
10301035
docker exec nextcloud sudo -u www-data php occ app_api:app:register app-skeleton-python harp_proxy \
1031-
--info-xml https://raw.githubusercontent.com/nextcloud/app-skeleton-python/main/appinfo/info.xml
1032-
docker exec nextcloud sudo -u www-data php occ app_api:app:enable app-skeleton-python
1036+
--info-xml https://raw.githubusercontent.com/nextcloud/app-skeleton-python/main/appinfo/info.xml \
1037+
--wait-finish
10331038
10341039
- name: Docker inspect output
10351040
if: always()
@@ -1051,10 +1056,10 @@ jobs:
10511056
- name: Save app and HaRP container info & logs
10521057
if: always()
10531058
run: |
1054-
docker inspect appapi-harp | json_pp > harp_container.json
1055-
docker logs appapi-harp > harp_container.log 2>&1
1056-
docker inspect nc_app_app-skeleton-python | json_pp > container.json
1057-
docker logs nc_app_app-skeleton-python > container.log 2>&1
1059+
docker inspect appapi-harp | json_pp > harp_bridge_container.json
1060+
docker logs appapi-harp > harp_bridge_container.log 2>&1
1061+
docker inspect nc_app_app-skeleton-python | json_pp > app_harp_bridge_container.json
1062+
docker logs nc_app_app-skeleton-python > app_harp_bridge_container.log 2>&1
10581063
10591064
- name: Unregister Skeleton & Daemon
10601065
run: |
@@ -1065,32 +1070,32 @@ jobs:
10651070
if: always()
10661071
uses: actions/upload-artifact@v4
10671072
with:
1068-
name: harp_bridge_app_container.json
1069-
path: app_container.json
1073+
name: app_harp_bridge_container.json
1074+
path: app_harp_bridge_container.json
10701075
if-no-files-found: warn
10711076

10721077
- name: Upload app container logs
10731078
if: always()
10741079
uses: actions/upload-artifact@v4
10751080
with:
1076-
name: harp_bridge_app_container.log
1077-
path: app_container.log
1081+
name: app_harp_bridge_container.log
1082+
path: app_harp_bridge_container.log
10781083
if-no-files-found: warn
10791084

10801085
- name: Upload HaRP Container info
10811086
if: always()
10821087
uses: actions/upload-artifact@v4
10831088
with:
10841089
name: harp_bridge_container.json
1085-
path: harp_container.json
1090+
path: harp_bridge_container.json
10861091
if-no-files-found: warn
10871092

10881093
- name: Upload HaRP container logs
10891094
if: always()
10901095
uses: actions/upload-artifact@v4
10911096
with:
10921097
name: harp_bridge_container.log
1093-
path: harp_container.log
1098+
path: harp_bridge_container.log
10941099
if-no-files-found: warn
10951100

10961101
- name: Upload NC logs
@@ -1111,6 +1116,11 @@ jobs:
11111116
- name: Set app env
11121117
run: echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
11131118

1119+
- name: Checkout AppAPI
1120+
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
1121+
with:
1122+
path: apps/${{ env.APP_NAME }}
1123+
11141124
- name: Create containers
11151125
run: |
11161126
docker network create master_bridge
@@ -1122,12 +1132,12 @@ jobs:
11221132
-v /var/run/docker.sock:/var/run/docker.sock \
11231133
--net master_bridge --name appapi-harp -h appapi-harp \
11241134
--restart unless-stopped \
1125-
--rm -d ghcr.io/nextcloud/nextcloud-appapi-harp:latest
1135+
-d ghcr.io/nextcloud/nextcloud-appapi-harp:latest
11261136
docker run --net master_bridge --name nextcloud-docker --rm -d ${{ env.docker-image }}
1127-
sed -i 's/127\.0\.0\.1:8080/nextcloud-docker/' /var/www/html/apps/${{ env.APP_NAME }}/tests/simple-nginx-NOT-FOR-PRODUCTION.conf'
1128-
sed -i 's/127\.0\.0\.1:8780/appapi-harp:8780/' /var/www/html/apps/${{ env.APP_NAME }}/tests/simple-nginx-NOT-FOR-PRODUCTION.conf'
1137+
sed -i 's/127\.0\.0\.1:8080/nextcloud-docker/' apps/${{ env.APP_NAME }}/tests/simple-nginx-NOT-FOR-PRODUCTION.conf'
1138+
sed -i 's/127\.0\.0\.1:8780/appapi-harp:8780/' apps/${{ env.APP_NAME }}/tests/simple-nginx-NOT-FOR-PRODUCTION.conf'
11291139
docker run --net master_bridge --name nextcloud --rm -d nginx \
1130-
-v /var/www/html/apps/${{ env.APP_NAME }}/tests/simple-nginx-NOT-FOR-PRODUCTION.conf:/etc/nginx/conf.d/default.conf:ro \
1140+
-v apps/${{ env.APP_NAME }}/tests/simple-nginx-NOT-FOR-PRODUCTION.conf:/etc/nginx/conf.d/default.conf:ro \
11311141
sleep 60s
11321142
11331143
- name: Install AppAPI
@@ -1146,8 +1156,8 @@ jobs:
11461156
- name: Registering and enabling Skeleton ExApp
11471157
run: |
11481158
docker exec nextcloud sudo -u www-data php occ app_api:app:register app-skeleton-python harp_proxy \
1149-
--info-xml https://raw.githubusercontent.com/nextcloud/app-skeleton-python/main/appinfo/info.xml
1150-
docker exec nextcloud sudo -u www-data php occ app_api:app:enable app-skeleton-python
1159+
--info-xml https://raw.githubusercontent.com/nextcloud/app-skeleton-python/main/appinfo/info.xml \
1160+
--wait-finish
11511161
11521162
- name: Docker inspect output
11531163
if: always()
@@ -1169,46 +1179,46 @@ jobs:
11691179
- name: Save app and HaRP container info & logs
11701180
if: always()
11711181
run: |
1172-
docker inspect appapi-harp | json_pp > harp_container.json
1173-
docker logs appapi-harp > harp_container.log 2>&1
1174-
docker inspect nc_app_app-skeleton-python | json_pp > container.json
1175-
docker logs nc_app_app-skeleton-python > container.log 2>&1
1182+
docker inspect appapi-harp | json_pp > harp_bridge_no_tls_container.json
1183+
docker logs appapi-harp > harp_bridge_no_tls_container.log 2>&1
1184+
docker inspect nc_app_app-skeleton-python | json_pp > app_harp_bridge_no_tls_container.json
1185+
docker logs nc_app_app-skeleton-python > app_harp_bridge_no_tls_container.log 2>&1
11761186
11771187
- name: Unregister Skeleton & Daemon
11781188
run: |
11791189
docker exec nextcloud sudo -u www-data php occ app_api:app:unregister app-skeleton-python
11801190
docker exec nextcloud sudo -u www-data php occ app_api:daemon:unregister harp_proxy
11811191
1182-
- name: Upload Container info
1192+
- name: Upload HaRP Container info
11831193
if: always()
11841194
uses: actions/upload-artifact@v4
11851195
with:
1186-
name: harp_bridge_app_container.json
1187-
path: app_container.json
1196+
name: harp_bridge_no_tls_container.json
1197+
path: harp_bridge_no_tls_container.json
11881198
if-no-files-found: warn
11891199

1190-
- name: Upload app container logs
1200+
- name: Upload HaRP container logs
11911201
if: always()
11921202
uses: actions/upload-artifact@v4
11931203
with:
1194-
name: harp_bridge_app_container.log
1195-
path: app_container.log
1204+
name: harp_bridge_no_tls_container.log
1205+
path: harp_bridge_no_tls_container.log
11961206
if-no-files-found: warn
11971207

1198-
- name: Upload HaRP Container info
1208+
- name: Upload app container info
11991209
if: always()
12001210
uses: actions/upload-artifact@v4
12011211
with:
1202-
name: harp_bridge_container.json
1203-
path: harp_container.json
1212+
name: app_harp_bridge_no_tls_container.json
1213+
path: app_harp_bridge_no_tls_container.json
12041214
if-no-files-found: warn
12051215

1206-
- name: Upload HaRP container logs
1216+
- name: Upload app container logs
12071217
if: always()
12081218
uses: actions/upload-artifact@v4
12091219
with:
1210-
name: harp_bridge_container.log
1211-
path: harp_container.log
1220+
name: app_harp_bridge_no_tls_container.log
1221+
path: app_harp_bridge_no_tls_container.log
12121222
if-no-files-found: warn
12131223

12141224
- name: Upload NC logs
@@ -1293,7 +1303,7 @@ jobs:
12931303
-v /var/run/docker.sock:/var/run/docker.sock \
12941304
--net host --name appapi-harp \
12951305
--restart unless-stopped \
1296-
--rm -d ghcr.io/nextcloud/nextcloud-appapi-harp:latest
1306+
-d ghcr.io/nextcloud/nextcloud-appapi-harp:latest
12971307
docker run --net host --name nextcloud --rm -d nginx \
12981308
-v /var/www/html/apps/${{ env.APP_NAME }}/tests/simple-nginx-NOT-FOR-PRODUCTION.conf:/etc/nginx/conf.d/default.conf:ro \
12991309
@@ -1305,9 +1315,9 @@ jobs:
13051315
--harp --harp_frp_address "127.0.0.1:8782" --harp_shared_key "some_very_secure_password" \
13061316
--net host --set-default
13071317
./occ app_api:daemon:list
1308-
./occ app_api:app:register app-skeleton-python \
1309-
--info-xml https://raw.githubusercontent.com/nextcloud/app-skeleton-python/main/appinfo/info.xml
1310-
./occ app_api:app:enable app-skeleton-python
1318+
./occ app_api:app:register app-skeleton-python harp_proxy \
1319+
--info-xml https://raw.githubusercontent.com/nextcloud/app-skeleton-python/main/appinfo/info.xml \
1320+
--wait-finish
13111321
./occ app_api:app:disable app-skeleton-python
13121322
13131323
- name: Check logs
@@ -1318,10 +1328,10 @@ jobs:
13181328
- name: Save app and HaRP container info & logs
13191329
if: always()
13201330
run: |
1321-
docker inspect appapi-harp | json_pp > harp_container.json
1322-
docker logs appapi-harp > harp_container.log 2>&1
1323-
docker inspect nc_app_app-skeleton-python | json_pp > app_container.json
1324-
docker logs nc_app_app-skeleton-python > app_container.log 2>&1
1331+
docker inspect appapi-harp | json_pp > harp_host_container.json
1332+
docker logs appapi-harp > harp_host_container.log 2>&1
1333+
docker inspect nc_app_app-skeleton-python | json_pp > app_host_container.json
1334+
docker logs nc_app_app-skeleton-python > app_host_container.log 2>&1
13251335
13261336
- name: Unregister Skeleton & Daemon
13271337
run: |
@@ -1331,44 +1341,44 @@ jobs:
13311341
- name: Test OCC commands(docker)
13321342
run: python3 apps/${{ env.APP_NAME }}/tests/test_occ_commands_docker.py
13331343

1334-
- name: Upload Container info
1344+
- name: Upload HaRP Container info
13351345
if: always()
13361346
uses: actions/upload-artifact@v4
13371347
with:
1338-
name: harp_bridge_app_container.json
1339-
path: app_container.json
1348+
name: harp_host_container.json
1349+
path: harp_host_container.json
13401350
if-no-files-found: warn
13411351

1342-
- name: Upload app container logs
1352+
- name: Upload HaRP container logs
13431353
if: always()
13441354
uses: actions/upload-artifact@v4
13451355
with:
1346-
name: harp_bridge_app_container.log
1347-
path: app_container.log
1356+
name: harp_host_container.log
1357+
path: harp_host_container.log
13481358
if-no-files-found: warn
13491359

1350-
- name: Upload HaRP Container info
1360+
- name: Upload app container info
13511361
if: always()
13521362
uses: actions/upload-artifact@v4
13531363
with:
1354-
name: harp_bridge_container.json
1355-
path: harp_container.json
1364+
name: app_host_container.json
1365+
path: app_host_container.json
13561366
if-no-files-found: warn
13571367

1358-
- name: Upload HaRP container logs
1368+
- name: Upload app container logs
13591369
if: always()
13601370
uses: actions/upload-artifact@v4
13611371
with:
1362-
name: harp_bridge_container.log
1363-
path: harp_container.log
1372+
name: app_host_container.log
1373+
path: app_host_container.log
13641374
if-no-files-found: warn
13651375

13661376
- name: Upload NC logs
13671377
if: always()
13681378
uses: actions/upload-artifact@v4
13691379
with:
1370-
name: harp_bridge_nextcloud.log
1371-
path: nextcloud.log
1380+
name: nextcloud.log
1381+
path: data/nextcloud.log
13721382
if-no-files-found: warn
13731383

13741384
tests-deploy-success:

0 commit comments

Comments
 (0)