Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

General Improvement #132

Merged
merged 12 commits into from
Aug 6, 2024
Merged

General Improvement #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
60de55d
remove: not needed
MahdiBaghbani Aug 6, 2024
839f849
add: docker volume and system prune on clean command
MahdiBaghbani Aug 6, 2024
c0d3e35
style: fix spaces
MahdiBaghbani Aug 6, 2024
b6dc9a3
refactor: move init files to their directory
MahdiBaghbani Aug 6, 2024
59fa565
modify: generate only the needed certs
MahdiBaghbani Aug 6, 2024
ef70708
remove: unused certificates
MahdiBaghbani Aug 6, 2024
e911836
fix: init script new paths
MahdiBaghbani Aug 6, 2024
edcda22
add: version to mariadb
MahdiBaghbani Aug 6, 2024
64519a7
modify: change latest tag to version tag in mariadb
MahdiBaghbani Aug 6, 2024
a0413ab
ci: test removing the ocm deps init
MahdiBaghbani Aug 6, 2024
4ee3447
add: curl to reva image
MahdiBaghbani Aug 6, 2024
f1f71c9
add: new docker images for future tranformations
MahdiBaghbani Aug 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions .github/workflows/ocm-test-suite.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,6 @@ jobs:
shell: bash
run: ./docker/pull/ocm-test-suite/${{ matrix.efss.platform }}.sh ${{ matrix.efss.version }}

- name: Initialize OCM tests dependencies.
shell: bash
run: ./init/ocm-test-suite.sh ci

- name: Run tests.
shell: bash
run: ./dev/ocm-test-suite.sh login ${{ matrix.efss.platform }} ${{ matrix.efss.version }} ci electron
Expand Down Expand Up @@ -180,10 +176,6 @@ jobs:
./docker/pull/ocm-test-suite/${{ matrix.sender.platform }}.sh ${{ matrix.sender.version }}
./docker/pull/ocm-test-suite/${{ matrix.receiver.platform }}.sh ${{ matrix.receiver.version }}

- name: Initialize OCM tests dependencies.
shell: bash
run: ./init/ocm-test-suite.sh ci

- name: Run tests.
shell: bash
run: ./dev/ocm-test-suite.sh share-with ${{ matrix.sender.platform }} ${{ matrix.sender.version }} ci electron ${{ matrix.receiver.platform }} ${{ matrix.receiver.version }}
Expand Down Expand Up @@ -246,10 +238,6 @@ jobs:
./docker/pull/ocm-test-suite/${{ matrix.sender.platform }}.sh ${{ matrix.sender.version }}
./docker/pull/ocm-test-suite/${{ matrix.receiver.platform }}.sh ${{ matrix.receiver.version }}

- name: Initialize OCM tests dependencies.
shell: bash
run: ./init/ocm-test-suite.sh ci

- name: Run tests.
shell: bash
run: ./dev/ocm-test-suite.sh share-link ${{ matrix.sender.platform }} ${{ matrix.sender.version }} ci electron ${{ matrix.receiver.platform }} ${{ matrix.receiver.version }}
Expand Down Expand Up @@ -312,10 +300,6 @@ jobs:
./docker/pull/ocm-test-suite/${{ matrix.sender.platform }}.sh ${{ matrix.sender.version }}
./docker/pull/ocm-test-suite/${{ matrix.receiver.platform }}.sh ${{ matrix.receiver.version }}

- name: Initialize OCM tests dependencies.
shell: bash
run: ./init/ocm-test-suite.sh ci

- name: Run tests.
shell: bash
run: ./dev/ocm-test-suite.sh invite-link ${{ matrix.sender.platform }} ${{ matrix.sender.version }} ci electron ${{ matrix.receiver.platform }} ${{ matrix.receiver.version }}
Expand Down
6 changes: 3 additions & 3 deletions dev/efss.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ function createEfss() {
docker run --detach --network=testnet \
--name="maria${platform}${number}.docker" \
-e MARIADB_ROOT_PASSWORD=eilohtho9oTahsuongeeTh7reedahPo1Ohwi3aek \
mariadb \
mariadb:11.4.2 \
--transaction-isolation=READ-COMMITTED \
--binlog-format=ROW \
--innodb-file-per-table=1 \
Expand Down Expand Up @@ -89,8 +89,8 @@ function createEfss() {
rm -rf "${ENV_ROOT}/temp" && mkdir --parents "${ENV_ROOT}/temp"

# copy init files.
cp -f "${ENV_ROOT}/docker/scripts/init-owncloud.sh" "${ENV_ROOT}/temp/owncloud.sh"
cp -f "${ENV_ROOT}/docker/scripts/init-nextcloud.sh" "${ENV_ROOT}/temp/nextcloud.sh"
cp -f "${ENV_ROOT}/docker/scripts/init/owncloud.sh" "${ENV_ROOT}/temp/owncloud.sh"
cp -f "${ENV_ROOT}/docker/scripts/init/nextcloud.sh" "${ENV_ROOT}/temp/nextcloud.sh"

# make sure network exists.
docker network inspect testnet >/dev/null 2>&1 || docker network create testnet >/dev/null 2>&1
Expand Down
4 changes: 2 additions & 2 deletions dev/federatedgroups.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ function createEfss() {
docker run --detach --network=testnet \
--name="maria${platform}${number}.docker" \
-e MARIADB_ROOT_PASSWORD=eilohtho9oTahsuongeeTh7reedahPo1Ohwi3aek \
mariadb \
mariadb:11.4.2 \
--transaction-isolation=READ-COMMITTED \
--binlog-format=ROW \
--innodb-file-per-table=1 \
Expand Down Expand Up @@ -111,7 +111,7 @@ rm -rf "${ENV_ROOT}/temp" && mkdir --parents "${ENV_ROOT}/temp"

# copy init files.
cp -Rf "${ENV_ROOT}/docker/scripts/federatedgroups" "${ENV_ROOT}/temp/federatedgroups"
cp -f "${ENV_ROOT}/docker/scripts/init-owncloud-federatedgroups.sh" "${ENV_ROOT}/temp/owncloud.sh"
cp -f "${ENV_ROOT}/docker/scripts/init/owncloud-federatedgroups.sh" "${ENV_ROOT}/temp/owncloud.sh"

# make sure network exists.
docker network inspect testnet >/dev/null 2>&1 || docker network create testnet >/dev/null 2>&1
Expand Down
6 changes: 3 additions & 3 deletions dev/ocm-test-suite/invite-link/nextcloud-nextcloud.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ function createEfss() {
redirect_to_null_cmd docker run --detach --network=testnet \
--name="maria${platform}${number}.docker" \
-e MARIADB_ROOT_PASSWORD=eilohtho9oTahsuongeeTh7reedahPo1Ohwi3aek \
mariadb \
mariadb:11.4.2 \
--transaction-isolation=READ-COMMITTED \
--binlog-format=ROW \
--innodb-file-per-table=1 \
Expand Down Expand Up @@ -156,8 +156,8 @@ rm -rf "${ENV_ROOT}/temp" && mkdir --parents "${ENV_ROOT}/temp/configs"
cp -fr "${ENV_ROOT}/docker/scripts/reva" "${ENV_ROOT}/temp/"
cp -fr "${ENV_ROOT}/docker/configs/revad" "${ENV_ROOT}/temp/reva/configs"
cp -f "${ENV_ROOT}/docker/scripts/ocmstub/index.js" "${ENV_ROOT}/temp/index.js"
cp -f "${ENV_ROOT}/docker/scripts/init-owncloud-sciencemesh.sh" "${ENV_ROOT}/temp/owncloud.sh"
cp -f "${ENV_ROOT}/docker/scripts/init-nextcloud-sciencemesh.sh" "${ENV_ROOT}/temp/nextcloud.sh"
cp -f "${ENV_ROOT}/docker/scripts/init/owncloud-sciencemesh.sh" "${ENV_ROOT}/temp/owncloud.sh"
cp -f "${ENV_ROOT}/docker/scripts/init/nextcloud-sciencemesh.sh" "${ENV_ROOT}/temp/nextcloud.sh"

# remove unnecessary configs.
rm "${ENV_ROOT}/temp/reva/configs/sciencemesh-apps-codimd.toml"
Expand Down
4 changes: 2 additions & 2 deletions dev/ocm-test-suite/invite-link/nextcloud-ocis.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ function createEfss() {
redirect_to_null_cmd docker run --detach --network=testnet \
--name="maria${platform}${number}.docker" \
-e MARIADB_ROOT_PASSWORD=eilohtho9oTahsuongeeTh7reedahPo1Ohwi3aek \
mariadb \
mariadb:11.4.2 \
--transaction-isolation=READ-COMMITTED \
--binlog-format=ROW \
--innodb-file-per-table=1 \
Expand Down Expand Up @@ -202,7 +202,7 @@ cp -fr "${ENV_ROOT}/docker/scripts/reva" "${ENV_R
cp -fr "${ENV_ROOT}/docker/configs/revad" "${ENV_ROOT}/temp/reva/configs"
cp -f "${ENV_ROOT}/docker/tls/certificates/ocis"* "${ENV_ROOT}/temp/certificates"
cp -fr "${ENV_ROOT}/docker/tls/certificate-authority" "${ENV_ROOT}/temp/certificate-authority"
cp -f "${ENV_ROOT}/docker/scripts/init-nextcloud-sciencemesh.sh" "${ENV_ROOT}/temp/nextcloud.sh"
cp -f "${ENV_ROOT}/docker/scripts/init/nextcloud-sciencemesh.sh" "${ENV_ROOT}/temp/nextcloud.sh"

# fix permissions.
chmod -R 777 "${ENV_ROOT}/temp/certificates"
Expand Down
6 changes: 3 additions & 3 deletions dev/ocm-test-suite/invite-link/nextcloud-owncloud.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ function createEfss() {
redirect_to_null_cmd docker run --detach --network=testnet \
--name="maria${platform}${number}.docker" \
-e MARIADB_ROOT_PASSWORD=eilohtho9oTahsuongeeTh7reedahPo1Ohwi3aek \
mariadb \
mariadb:11.4.2 \
--transaction-isolation=READ-COMMITTED \
--binlog-format=ROW \
--innodb-file-per-table=1 \
Expand Down Expand Up @@ -155,8 +155,8 @@ rm -rf "${ENV_ROOT}/temp" && mkdir --parents "${ENV_ROOT}/temp/configs"
cp -fr "${ENV_ROOT}/docker/scripts/reva" "${ENV_ROOT}/temp/"
cp -fr "${ENV_ROOT}/docker/configs/revad" "${ENV_ROOT}/temp/reva/configs"
cp -f "${ENV_ROOT}/docker/scripts/ocmstub/index.js" "${ENV_ROOT}/temp/index.js"
cp -f "${ENV_ROOT}/docker/scripts/init-owncloud-sciencemesh.sh" "${ENV_ROOT}/temp/owncloud.sh"
cp -f "${ENV_ROOT}/docker/scripts/init-nextcloud-sciencemesh.sh" "${ENV_ROOT}/temp/nextcloud.sh"
cp -f "${ENV_ROOT}/docker/scripts/init/owncloud-sciencemesh.sh" "${ENV_ROOT}/temp/owncloud.sh"
cp -f "${ENV_ROOT}/docker/scripts/init/nextcloud-sciencemesh.sh" "${ENV_ROOT}/temp/nextcloud.sh"

# remove unnecessary configs.
rm "${ENV_ROOT}/temp/reva/configs/sciencemesh-apps-codimd.toml"
Expand Down
4 changes: 2 additions & 2 deletions dev/ocm-test-suite/invite-link/ocis-nextcloud.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ function createEfss() {
redirect_to_null_cmd docker run --detach --network=testnet \
--name="maria${platform}${number}.docker" \
-e MARIADB_ROOT_PASSWORD=eilohtho9oTahsuongeeTh7reedahPo1Ohwi3aek \
mariadb \
mariadb:11.4.2 \
--transaction-isolation=READ-COMMITTED \
--binlog-format=ROW \
--innodb-file-per-table=1 \
Expand Down Expand Up @@ -202,7 +202,7 @@ cp -fr "${ENV_ROOT}/docker/scripts/reva" "${ENV_R
cp -fr "${ENV_ROOT}/docker/configs/revad" "${ENV_ROOT}/temp/reva/configs"
cp -f "${ENV_ROOT}/docker/tls/certificates/ocis"* "${ENV_ROOT}/temp/certificates"
cp -fr "${ENV_ROOT}/docker/tls/certificate-authority" "${ENV_ROOT}/temp/certificate-authority"
cp -f "${ENV_ROOT}/docker/scripts/init-nextcloud-sciencemesh.sh" "${ENV_ROOT}/temp/nextcloud.sh"
cp -f "${ENV_ROOT}/docker/scripts/init/nextcloud-sciencemesh.sh" "${ENV_ROOT}/temp/nextcloud.sh"

# fix permissions.
chmod -R 777 "${ENV_ROOT}/temp/certificates"
Expand Down
4 changes: 2 additions & 2 deletions dev/ocm-test-suite/invite-link/ocis-owncloud.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ function createEfss() {
redirect_to_null_cmd docker run --detach --network=testnet \
--name="maria${platform}${number}.docker" \
-e MARIADB_ROOT_PASSWORD=eilohtho9oTahsuongeeTh7reedahPo1Ohwi3aek \
mariadb \
mariadb:11.4.2 \
--transaction-isolation=READ-COMMITTED \
--binlog-format=ROW \
--innodb-file-per-table=1 \
Expand Down Expand Up @@ -201,7 +201,7 @@ cp -fr "${ENV_ROOT}/docker/scripts/reva" "${ENV_R
cp -fr "${ENV_ROOT}/docker/configs/revad" "${ENV_ROOT}/temp/reva/configs"
cp -f "${ENV_ROOT}/docker/tls/certificates/ocis"* "${ENV_ROOT}/temp/certificates"
cp -fr "${ENV_ROOT}/docker/tls/certificate-authority" "${ENV_ROOT}/temp/certificate-authority"
cp -f "${ENV_ROOT}/docker/scripts/init-owncloud-sciencemesh.sh" "${ENV_ROOT}/temp/owncloud.sh"
cp -f "${ENV_ROOT}/docker/scripts/init/owncloud-sciencemesh.sh" "${ENV_ROOT}/temp/owncloud.sh"

# fix permissions.
chmod -R 777 "${ENV_ROOT}/temp/certificates"
Expand Down
6 changes: 3 additions & 3 deletions dev/ocm-test-suite/invite-link/owncloud-nextcloud.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ function createEfss() {
redirect_to_null_cmd docker run --detach --network=testnet \
--name="maria${platform}${number}.docker" \
-e MARIADB_ROOT_PASSWORD=eilohtho9oTahsuongeeTh7reedahPo1Ohwi3aek \
mariadb \
mariadb:11.4.2 \
--transaction-isolation=READ-COMMITTED \
--binlog-format=ROW \
--innodb-file-per-table=1 \
Expand Down Expand Up @@ -155,8 +155,8 @@ rm -rf "${ENV_ROOT}/temp" && mkdir --parents "${ENV_ROOT}/temp/configs"
cp -fr "${ENV_ROOT}/docker/scripts/reva" "${ENV_ROOT}/temp/"
cp -fr "${ENV_ROOT}/docker/configs/revad" "${ENV_ROOT}/temp/reva/configs"
cp -f "${ENV_ROOT}/docker/scripts/ocmstub/index.js" "${ENV_ROOT}/temp/index.js"
cp -f "${ENV_ROOT}/docker/scripts/init-owncloud-sciencemesh.sh" "${ENV_ROOT}/temp/owncloud.sh"
cp -f "${ENV_ROOT}/docker/scripts/init-nextcloud-sciencemesh.sh" "${ENV_ROOT}/temp/nextcloud.sh"
cp -f "${ENV_ROOT}/docker/scripts/init/owncloud-sciencemesh.sh" "${ENV_ROOT}/temp/owncloud.sh"
cp -f "${ENV_ROOT}/docker/scripts/init/nextcloud-sciencemesh.sh" "${ENV_ROOT}/temp/nextcloud.sh"

# remove unnecessary configs.
rm "${ENV_ROOT}/temp/reva/configs/sciencemesh-apps-codimd.toml"
Expand Down
4 changes: 2 additions & 2 deletions dev/ocm-test-suite/invite-link/owncloud-ocis.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ function createEfss() {
redirect_to_null_cmd docker run --detach --network=testnet \
--name="maria${platform}${number}.docker" \
-e MARIADB_ROOT_PASSWORD=eilohtho9oTahsuongeeTh7reedahPo1Ohwi3aek \
mariadb \
mariadb:11.4.2 \
--transaction-isolation=READ-COMMITTED \
--binlog-format=ROW \
--innodb-file-per-table=1 \
Expand Down Expand Up @@ -202,7 +202,7 @@ cp -fr "${ENV_ROOT}/docker/scripts/reva" "${ENV_R
cp -fr "${ENV_ROOT}/docker/configs/revad" "${ENV_ROOT}/temp/reva/configs"
cp -f "${ENV_ROOT}/docker/tls/certificates/ocis"* "${ENV_ROOT}/temp/certificates"
cp -fr "${ENV_ROOT}/docker/tls/certificate-authority" "${ENV_ROOT}/temp/certificate-authority"
cp -f "${ENV_ROOT}/docker/scripts/init-owncloud-sciencemesh.sh" "${ENV_ROOT}/temp/owncloud.sh"
cp -f "${ENV_ROOT}/docker/scripts/init/owncloud-sciencemesh.sh" "${ENV_ROOT}/temp/owncloud.sh"

# fix permissions.
chmod -R 777 "${ENV_ROOT}/temp/certificates"
Expand Down
6 changes: 3 additions & 3 deletions dev/ocm-test-suite/invite-link/owncloud-owncloud.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ function createEfss() {
redirect_to_null_cmd docker run --detach --network=testnet \
--name="maria${platform}${number}.docker" \
-e MARIADB_ROOT_PASSWORD=eilohtho9oTahsuongeeTh7reedahPo1Ohwi3aek \
mariadb \
mariadb:11.4.2 \
--transaction-isolation=READ-COMMITTED \
--binlog-format=ROW \
--innodb-file-per-table=1 \
Expand Down Expand Up @@ -154,8 +154,8 @@ rm -rf "${ENV_ROOT}/temp" && mkdir --parents "${ENV_ROOT}/temp/configs"
cp -fr "${ENV_ROOT}/docker/scripts/reva" "${ENV_ROOT}/temp/"
cp -fr "${ENV_ROOT}/docker/configs/revad" "${ENV_ROOT}/temp/reva/configs"
cp -f "${ENV_ROOT}/docker/scripts/ocmstub/index.js" "${ENV_ROOT}/temp/index.js"
cp -f "${ENV_ROOT}/docker/scripts/init-owncloud-sciencemesh.sh" "${ENV_ROOT}/temp/owncloud.sh"
cp -f "${ENV_ROOT}/docker/scripts/init-nextcloud-sciencemesh.sh" "${ENV_ROOT}/temp/nextcloud.sh"
cp -f "${ENV_ROOT}/docker/scripts/init/owncloud-sciencemesh.sh" "${ENV_ROOT}/temp/owncloud.sh"
cp -f "${ENV_ROOT}/docker/scripts/init/nextcloud-sciencemesh.sh" "${ENV_ROOT}/temp/nextcloud.sh"

# remove unnecessary configs.
rm "${ENV_ROOT}/temp/reva/configs/sciencemesh-apps-codimd.toml"
Expand Down
Loading
Loading