inteligr8/alfresco-content-app
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-content-app.git synced 2025-07-24 17:31:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ACA-4232] Call the scan-env adf-cli command before and after each E2E job (#1911)

Browse Source 
* [ACA-4232] Call the scan-env adf-cli command before and after each E2E job

* [ACA-4232] Updated host environment variable
This commit is contained in:
Thomas Hunter
2021-01-14 09:06:43 +00:00
committed by GitHub
parent e227248324
commit e14557ce43
4 changed files with 30 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
package-lock.json generated
View File

@@ -5,12 +5,12 @@
"requires": true, "requires": true,
"dependencies": { "dependencies": {
"@alfresco/adf-cli": { "@alfresco/adf-cli": {
"version": "4.2.0", "version": "4.3.0-2839e9faf2e7832078e0b2f40a42308b45dc2f1e",
"resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-4.2.0.tgz", "resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-4.3.0-2839e9faf2e7832078e0b2f40a42308b45dc2f1e.tgz",
"integrity": "sha512-ROjrkanLKKL2oStj6/4FzA+mL1YmpTjl9A7j3YMYaLlWRGqvF5KBzOvh0He2a6shXa2ekH+uEFxDkAeYNI9B0w==", "integrity": "sha512-hfmLYxxv/a9c4NcW9XOpOFxbN2KqkRRQdkI5KNVW7r36yDDuZPXuguwrIzOE9UAkYNfG1RTGWnuLj+IOrFooag==",
"dev": true, "dev": true,
"requires": { "requires": {
"@alfresco/js-api": "4.2.0", "@alfresco/js-api": "4.3.0-fc33b5aba2cdfe131d2f061049691b5e5b6fe59b",
"commander": "^4.0.0", "commander": "^4.0.0",
"ejs": "^2.6.1", "ejs": "^2.6.1",
"license-checker": "^25.0.1", "license-checker": "^25.0.1",
@@ -20,17 +20,6 @@
"spdx-license-list": "^5.0.0" "spdx-license-list": "^5.0.0"
}, },
"dependencies": { "dependencies": {
"@alfresco/js-api": {
"version": "4.2.0",
"resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-4.2.0.tgz",
"integrity": "sha512-gaKTfiTPbcFdtcBQJ2qWFXVegOSt3FgQpUtzS64uQK9BrFS74wYqIVgYc+00RmGGmpEumKlPxxoSF/xWhrzIEA==",
"dev": true,
"requires": {
"event-emitter": "^0.3.5",
"minimatch": "3.0.4",
"superagent": "^6.0.0"
}
},
"commander": { "commander": {
"version": "4.1.1", "version": "4.1.1",
"resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz", "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
@@ -40,42 +29,42 @@
} }
}, },
"@alfresco/adf-content-services": { "@alfresco/adf-content-services": {
"version": "4.2.0", "version": "4.3.0-2839e9faf2e7832078e0b2f40a42308b45dc2f1e",
"resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-4.2.0.tgz", "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-4.3.0-2839e9faf2e7832078e0b2f40a42308b45dc2f1e.tgz",
"integrity": "sha512-u8ZF50FV6vlA73uw6fWgEhTLVVcczL1g5I/NzYHuvIVSe9DsMCQ/LQqz3GwBjJsdA1xWCPjM9ox8JSIYsHeE5Q==", "integrity": "sha512-//E6Dl7ghDc9lsK5a/JKnzYDLIgd6PSBZ0dsptIF4PTaSRsuHjlYhBbZDM36mQANBOMIEeQinC08L85IJwClEg==",
"requires": { "requires": {
"tslib": "^2.0.0" "tslib": "^2.0.0"
} }
}, },
"@alfresco/adf-core": { "@alfresco/adf-core": {
"version": "4.2.0", "version": "4.3.0-2839e9faf2e7832078e0b2f40a42308b45dc2f1e",
"resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-4.2.0.tgz", "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-4.3.0-2839e9faf2e7832078e0b2f40a42308b45dc2f1e.tgz",
"integrity": "sha512-6DIxhEhZ9VVqPrZyqMaHVFJ1xPRaQK7xMbfbN55RiX3Zv3WotQrZGE04xyVLv8aYQycZ/k+lNVopw3xq4RxMEw==", "integrity": "sha512-dVBoC21Ljdq1wccPqq/wM5iNqzbqs40aNlElmkdyGf+50WM8VS8YjGck6eysZaLjll27bdK0HqXIWUR3Q//iPA==",
"requires": { "requires": {
"tslib": "^2.0.0" "tslib": "^2.0.0"
} }
}, },
"@alfresco/adf-extensions": { "@alfresco/adf-extensions": {
"version": "4.2.0", "version": "4.3.0-2839e9faf2e7832078e0b2f40a42308b45dc2f1e",
"resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-4.2.0.tgz", "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-4.3.0-2839e9faf2e7832078e0b2f40a42308b45dc2f1e.tgz",
"integrity": "sha512-Vr2mvki22hUyuz9/048Z8L696MHEfwEeDlIVZTOq3gLtEaQ4WvMlZVbkT+JiZyNfqxjejX/S9XT/37bqf3vikw==", "integrity": "sha512-GTYPHo9sLlbDxfZ4JfTBQ5uycBJgC8UWwXQsoZ1O2fvz3ISCCgdeha1RYRBPpasceOENjdQgkiXeIWH6/Kk8Ug==",
"requires": { "requires": {
"tslib": "^2.0.0" "tslib": "^2.0.0"
} }
}, },
"@alfresco/adf-testing": { "@alfresco/adf-testing": {
"version": "4.2.0", "version": "4.3.0-2839e9faf2e7832078e0b2f40a42308b45dc2f1e",
"resolved": "https://registry.npmjs.org/@alfresco/adf-testing/-/adf-testing-4.2.0.tgz", "resolved": "https://registry.npmjs.org/@alfresco/adf-testing/-/adf-testing-4.3.0-2839e9faf2e7832078e0b2f40a42308b45dc2f1e.tgz",
"integrity": "sha512-zWGc9wjBPfuIKZVYmcgENPXLIXNGprNDJUya1uvw0iKr5UdVR43frVNtF1zkEWcm3yD2eTEFwWrWwfr066YZxQ==", "integrity": "sha512-PX1OevoCVB8GcCxsRWJWs0PK3NyCC4KcpqVWDTikVBN9uQGyphchjbwJ3juvWCjKox7mYpxUyz31h/pRVz/LVQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"tslib": "^2.0.0" "tslib": "^2.0.0"
} }
}, },
"@alfresco/js-api": { "@alfresco/js-api": {
"version": "4.2.0", "version": "4.3.0-fc33b5aba2cdfe131d2f061049691b5e5b6fe59b",
"resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-4.2.0.tgz", "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-4.3.0-fc33b5aba2cdfe131d2f061049691b5e5b6fe59b.tgz",
"integrity": "sha512-gaKTfiTPbcFdtcBQJ2qWFXVegOSt3FgQpUtzS64uQK9BrFS74wYqIVgYc+00RmGGmpEumKlPxxoSF/xWhrzIEA==", "integrity": "sha512-lp+rlcNE3DfS9Pua6imdtFqmVyNztiJPLvcgv1XKg2yRHhWdzNfvufbAWtPq5i4ZjcIPlCvydDgABDof3YGDMg==",
"requires": { "requires": {
"event-emitter": "^0.3.5", "event-emitter": "^0.3.5",
"minimatch": "3.0.4", "minimatch": "3.0.4",

12
package.json
View File

@@ -24,10 +24,10 @@
}, },
"private": true, "private": true,
"dependencies": { "dependencies": {
"@alfresco/adf-content-services": "4.2.0", "@alfresco/adf-content-services": "4.3.0-2839e9faf2e7832078e0b2f40a42308b45dc2f1e",
"@alfresco/adf-core": "4.2.0", "@alfresco/adf-core": "4.3.0-2839e9faf2e7832078e0b2f40a42308b45dc2f1e",
"@alfresco/adf-extensions": "4.2.0", "@alfresco/adf-extensions": "4.3.0-2839e9faf2e7832078e0b2f40a42308b45dc2f1e",
"@alfresco/js-api": "4.2.0", "@alfresco/js-api": "4.3.0-fc33b5aba2cdfe131d2f061049691b5e5b6fe59b",
"@angular/animations": "10.0.4", "@angular/animations": "10.0.4",
"@angular/cdk": "^10.0.2", "@angular/cdk": "^10.0.2",
"@angular/common": "10.0.4", "@angular/common": "10.0.4",
@@ -56,8 +56,8 @@
"zone.js": "~0.10.2" "zone.js": "~0.10.2"
}, },
"devDependencies": { "devDependencies": {
"@alfresco/adf-cli": "4.2.0", "@alfresco/adf-cli": "4.3.0-2839e9faf2e7832078e0b2f40a42308b45dc2f1e",
"@alfresco/adf-testing": "4.2.0", "@alfresco/adf-testing": "4.3.0-2839e9faf2e7832078e0b2f40a42308b45dc2f1e",
"@angular-custom-builders/lite-serve": "^0.2.2", "@angular-custom-builders/lite-serve": "^0.2.2",
"@angular-devkit/build-angular": "^0.1002.0", "@angular-devkit/build-angular": "^0.1002.0",
"@angular-devkit/build-ng-packagr": "^0.1002.0", "@angular-devkit/build-ng-packagr": "^0.1002.0",

2
scripts/ci/job_hooks/after_e2e.sh
View File

@@ -2,3 +2,5 @@
# Upload protractor-smartrunner artifact related to this particular job to S3 # Upload protractor-smartrunner artifact related to this particular job to S3
./scripts/ci/utils/artifact-to-s3.sh -a "$SMART_RUNNER_DIRECTORY" -o "$S3_DBP_FOLDER/protractor-smartrunner-$TRAVIS_JOB_ID.tar.bz2" ./scripts/ci/utils/artifact-to-s3.sh -a "$SMART_RUNNER_DIRECTORY" -o "$S3_DBP_FOLDER/protractor-smartrunner-$TRAVIS_JOB_ID.tar.bz2"
./node_modules/@alfresco/adf-cli/bin/adf-cli scan-env --host "$API_CONTENT_HOST" -u "$ADMIN_EMAIL" -p "$ADMIN_PASSWORD"

3
scripts/ci/job_hooks/before_e2e.sh
View File

@@ -4,6 +4,9 @@ FROM=$1;
TO=$2; TO=$2;
PARAMS=$3; PARAMS=$3;
echo "====== Scan environment ====="
./node_modules/@alfresco/adf-cli/bin/adf-cli scan-env --host "$API_CONTENT_HOST" -u "$ADMIN_EMAIL" -p "$ADMIN_PASSWORD"
echo "====== Check content UP =====" echo "====== Check content UP ====="
./node_modules/@alfresco/adf-cli/bin/adf-cli check-cs-env --host "$API_CONTENT_HOST" -u "$ADMIN_EMAIL" -p "$ADMIN_PASSWORD" || exit 1 ./node_modules/@alfresco/adf-cli/bin/adf-cli check-cs-env --host "$API_CONTENT_HOST" -u "$ADMIN_EMAIL" -p "$ADMIN_PASSWORD" || exit 1