From dd44be2fd7f1a9de774788239f2724df1d6966b9 Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Thu, 17 Oct 2019 09:12:28 +0200 Subject: [PATCH 1/3] test NC17 Signed-off-by: tobiasKaminsky --- .drone.yml | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 72 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index c3497c28e..12d8ffd85 100644 --- a/.drone.yml +++ b/.drone.yml @@ -38,7 +38,7 @@ trigger: --- kind: pipeline -name: test +name: test-nextcloud-master steps: - name: test @@ -99,6 +99,77 @@ services: - su www-data -c "php /var/www/html/occ group:adduser users user2" - /run.sh +trigger: + branch: + - master + event: + - push + - pull_request +--- +kind: pipeline +name: test-nextcloud-17 + +steps: + - name: test + image: nextcloudci/android:android-44 + privileged: true + environment: + LOG_USERNAME: + from_secret: LOG_USERNAME + LOG_PASSWORD: + from_secret: LOG_PASSWORD + GIT_USERNAME: + from_secret: GIT_USERNAME + GIT_TOKEN: + from_secret: GIT_TOKEN + commands: + - emulator -avd android-27 -no-window -no-audio & + - ./wait_for_emulator.sh + - ./gradlew assembleDebug + - ./gradlew jacocoTestDebugUnitTestReport || scripts/uploadReport.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER "Unit" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN + - ./gradlew installDebugAndroidTest + - ./gradlew createDebugCoverageReport || scripts/uploadReport.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER "IT" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN + - ./gradlew combinedTestReport + - curl -o codecov.sh https://codecov.io/bash + - bash ./codecov.sh -t 2eec98c3-ff20-4cad-9e08-463471a33431 + + - name: notify + image: drillster/drone-email + settings: + port: 587 + from: nextcloud-drone@kaminsky.me + recipients_only: true + username: + from_secret: EMAIL_USERNAME + password: + from_secret: EMAIL_PASSWORD + recipients: + from_secret: EMAIL_RECIPIENTS + host: + from_secret: EMAIL_HOST + when: + event: + - push + status: + - failure + branch: + - master + +services: + - name: server-17 + image: nextcloudci/server:server-13 + environment: + BRANCH: stable-17 + commands: + - /initnc.sh + - su www-data -c "OC_PASS=user1 php /var/www/html/occ user:add --password-from-env --display-name='User One' user1" + - su www-data -c "OC_PASS=user2 php /var/www/html/occ user:add --password-from-env --display-name='User Two' user2" + - su www-data -c "php /var/www/html/occ user:setting user2 files quota 1G" + - su www-data -c "php /var/www/html/occ group:add users" + - su www-data -c "php /var/www/html/occ group:adduser users user1" + - su www-data -c "php /var/www/html/occ group:adduser users user2" + - /run.sh + trigger: branch: - master From c856aacec808dd2b329290be256461877f0340a8 Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Thu, 17 Oct 2019 09:56:56 +0200 Subject: [PATCH 2/3] test NC16, NC15 Signed-off-by: tobiasKaminsky --- .drone.yml | 143 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 141 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 12d8ffd85..3e66fce7e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -130,8 +130,6 @@ steps: - ./gradlew installDebugAndroidTest - ./gradlew createDebugCoverageReport || scripts/uploadReport.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER "IT" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN - ./gradlew combinedTestReport - - curl -o codecov.sh https://codecov.io/bash - - bash ./codecov.sh -t 2eec98c3-ff20-4cad-9e08-463471a33431 - name: notify image: drillster/drone-email @@ -176,6 +174,147 @@ trigger: event: - push - pull_request + +--- +kind: pipeline +name: test-nextcloud-16 + +steps: + - name: test + image: nextcloudci/android:android-44 + privileged: true + environment: + LOG_USERNAME: + from_secret: LOG_USERNAME + LOG_PASSWORD: + from_secret: LOG_PASSWORD + GIT_USERNAME: + from_secret: GIT_USERNAME + GIT_TOKEN: + from_secret: GIT_TOKEN + commands: + - emulator -avd android-27 -no-window -no-audio & + - ./wait_for_emulator.sh + - ./gradlew assembleDebug + - ./gradlew jacocoTestDebugUnitTestReport || scripts/uploadReport.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER "Unit" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN + - ./gradlew installDebugAndroidTest + - ./gradlew createDebugCoverageReport || scripts/uploadReport.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER "IT" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN + - ./gradlew combinedTestReport + + - name: notify + image: drillster/drone-email + settings: + port: 587 + from: nextcloud-drone@kaminsky.me + recipients_only: true + username: + from_secret: EMAIL_USERNAME + password: + from_secret: EMAIL_PASSWORD + recipients: + from_secret: EMAIL_RECIPIENTS + host: + from_secret: EMAIL_HOST + when: + event: + - push + status: + - failure + branch: + - master + +services: + - name: server-16 + image: nextcloudci/server:server-13 + environment: + BRANCH: stable-16 + commands: + - /initnc.sh + - su www-data -c "OC_PASS=user1 php /var/www/html/occ user:add --password-from-env --display-name='User One' user1" + - su www-data -c "OC_PASS=user2 php /var/www/html/occ user:add --password-from-env --display-name='User Two' user2" + - su www-data -c "php /var/www/html/occ user:setting user2 files quota 1G" + - su www-data -c "php /var/www/html/occ group:add users" + - su www-data -c "php /var/www/html/occ group:adduser users user1" + - su www-data -c "php /var/www/html/occ group:adduser users user2" + - /run.sh + +trigger: + branch: + - master + event: + - push + - pull_request + +--- +kind: pipeline +name: test-nextcloud-15 + +steps: + - name: test + image: nextcloudci/android:android-44 + privileged: true + environment: + LOG_USERNAME: + from_secret: LOG_USERNAME + LOG_PASSWORD: + from_secret: LOG_PASSWORD + GIT_USERNAME: + from_secret: GIT_USERNAME + GIT_TOKEN: + from_secret: GIT_TOKEN + commands: + - emulator -avd android-27 -no-window -no-audio & + - ./wait_for_emulator.sh + - ./gradlew assembleDebug + - ./gradlew jacocoTestDebugUnitTestReport || scripts/uploadReport.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER "Unit" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN + - ./gradlew installDebugAndroidTest + - ./gradlew createDebugCoverageReport || scripts/uploadReport.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER "IT" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN + - ./gradlew combinedTestReport + + - name: notify + image: drillster/drone-email + settings: + port: 587 + from: nextcloud-drone@kaminsky.me + recipients_only: true + username: + from_secret: EMAIL_USERNAME + password: + from_secret: EMAIL_PASSWORD + recipients: + from_secret: EMAIL_RECIPIENTS + host: + from_secret: EMAIL_HOST + when: + event: + - push + status: + - failure + branch: + - master + +services: + - name: server-15 + image: nextcloudci/server:server-13 + environment: + BRANCH: stable-15 + commands: + - /initnc.sh + - su www-data -c "OC_PASS=user1 php /var/www/html/occ user:add --password-from-env --display-name='User One' user1" + - su www-data -c "OC_PASS=user2 php /var/www/html/occ user:add --password-from-env --display-name='User Two' user2" + - su www-data -c "php /var/www/html/occ user:setting user2 files quota 1G" + - su www-data -c "php /var/www/html/occ group:add users" + - su www-data -c "php /var/www/html/occ group:adduser users user1" + - su www-data -c "php /var/www/html/occ group:adduser users user2" + - /run.sh + +trigger: + branch: + - master + event: + - push + - pull_request + --- kind: pipeline name: analysis From 624390feb90b343f8dfa2fdc50897abc12d2502b Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Thu, 17 Oct 2019 10:24:08 +0200 Subject: [PATCH 3/3] test NC16, NC15 Signed-off-by: tobiasKaminsky --- .drone.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.drone.yml b/.drone.yml index 3e66fce7e..7a3310d92 100644 --- a/.drone.yml +++ b/.drone.yml @@ -124,6 +124,7 @@ steps: from_secret: GIT_TOKEN commands: - emulator -avd android-27 -no-window -no-audio & + - sed -i s'#http://server#http://server-17#' gradle.properties - ./wait_for_emulator.sh - ./gradlew assembleDebug - ./gradlew jacocoTestDebugUnitTestReport || scripts/uploadReport.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER "Unit" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN @@ -194,6 +195,7 @@ steps: from_secret: GIT_TOKEN commands: - emulator -avd android-27 -no-window -no-audio & + - sed -i s'#http://server#http://server-16#' gradle.properties - ./wait_for_emulator.sh - ./gradlew assembleDebug - ./gradlew jacocoTestDebugUnitTestReport || scripts/uploadReport.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER "Unit" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN @@ -264,6 +266,7 @@ steps: from_secret: GIT_TOKEN commands: - emulator -avd android-27 -no-window -no-audio & + - sed -i s'#http://server#http://server-15#' gradle.properties - ./wait_for_emulator.sh - ./gradlew assembleDebug - ./gradlew jacocoTestDebugUnitTestReport || scripts/uploadReport.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER "Unit" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN