diff --git a/package-lock.json b/package-lock.json index fb50b5f67..1b6509073 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,12 +5,12 @@ "requires": true, "dependencies": { "@alfresco/adf-cli": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-4.2.0.tgz", - "integrity": "sha512-ROjrkanLKKL2oStj6/4FzA+mL1YmpTjl9A7j3YMYaLlWRGqvF5KBzOvh0He2a6shXa2ekH+uEFxDkAeYNI9B0w==", + "version": "4.3.0-2839e9faf2e7832078e0b2f40a42308b45dc2f1e", + "resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-4.3.0-2839e9faf2e7832078e0b2f40a42308b45dc2f1e.tgz", + "integrity": "sha512-hfmLYxxv/a9c4NcW9XOpOFxbN2KqkRRQdkI5KNVW7r36yDDuZPXuguwrIzOE9UAkYNfG1RTGWnuLj+IOrFooag==", "dev": true, "requires": { - "@alfresco/js-api": "4.2.0", + "@alfresco/js-api": "4.3.0-fc33b5aba2cdfe131d2f061049691b5e5b6fe59b", "commander": "^4.0.0", "ejs": "^2.6.1", "license-checker": "^25.0.1", @@ -20,17 +20,6 @@ "spdx-license-list": "^5.0.0" }, "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": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz", @@ -40,42 +29,42 @@ } }, "@alfresco/adf-content-services": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-4.2.0.tgz", - "integrity": "sha512-u8ZF50FV6vlA73uw6fWgEhTLVVcczL1g5I/NzYHuvIVSe9DsMCQ/LQqz3GwBjJsdA1xWCPjM9ox8JSIYsHeE5Q==", + "version": "4.3.0-2839e9faf2e7832078e0b2f40a42308b45dc2f1e", + "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-4.3.0-2839e9faf2e7832078e0b2f40a42308b45dc2f1e.tgz", + "integrity": "sha512-//E6Dl7ghDc9lsK5a/JKnzYDLIgd6PSBZ0dsptIF4PTaSRsuHjlYhBbZDM36mQANBOMIEeQinC08L85IJwClEg==", "requires": { "tslib": "^2.0.0" } }, "@alfresco/adf-core": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-4.2.0.tgz", - "integrity": "sha512-6DIxhEhZ9VVqPrZyqMaHVFJ1xPRaQK7xMbfbN55RiX3Zv3WotQrZGE04xyVLv8aYQycZ/k+lNVopw3xq4RxMEw==", + "version": "4.3.0-2839e9faf2e7832078e0b2f40a42308b45dc2f1e", + "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-4.3.0-2839e9faf2e7832078e0b2f40a42308b45dc2f1e.tgz", + "integrity": "sha512-dVBoC21Ljdq1wccPqq/wM5iNqzbqs40aNlElmkdyGf+50WM8VS8YjGck6eysZaLjll27bdK0HqXIWUR3Q//iPA==", "requires": { "tslib": "^2.0.0" } }, "@alfresco/adf-extensions": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-4.2.0.tgz", - "integrity": "sha512-Vr2mvki22hUyuz9/048Z8L696MHEfwEeDlIVZTOq3gLtEaQ4WvMlZVbkT+JiZyNfqxjejX/S9XT/37bqf3vikw==", + "version": "4.3.0-2839e9faf2e7832078e0b2f40a42308b45dc2f1e", + "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-4.3.0-2839e9faf2e7832078e0b2f40a42308b45dc2f1e.tgz", + "integrity": "sha512-GTYPHo9sLlbDxfZ4JfTBQ5uycBJgC8UWwXQsoZ1O2fvz3ISCCgdeha1RYRBPpasceOENjdQgkiXeIWH6/Kk8Ug==", "requires": { "tslib": "^2.0.0" } }, "@alfresco/adf-testing": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@alfresco/adf-testing/-/adf-testing-4.2.0.tgz", - "integrity": "sha512-zWGc9wjBPfuIKZVYmcgENPXLIXNGprNDJUya1uvw0iKr5UdVR43frVNtF1zkEWcm3yD2eTEFwWrWwfr066YZxQ==", + "version": "4.3.0-2839e9faf2e7832078e0b2f40a42308b45dc2f1e", + "resolved": "https://registry.npmjs.org/@alfresco/adf-testing/-/adf-testing-4.3.0-2839e9faf2e7832078e0b2f40a42308b45dc2f1e.tgz", + "integrity": "sha512-PX1OevoCVB8GcCxsRWJWs0PK3NyCC4KcpqVWDTikVBN9uQGyphchjbwJ3juvWCjKox7mYpxUyz31h/pRVz/LVQ==", "dev": true, "requires": { "tslib": "^2.0.0" } }, "@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==", + "version": "4.3.0-fc33b5aba2cdfe131d2f061049691b5e5b6fe59b", + "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-4.3.0-fc33b5aba2cdfe131d2f061049691b5e5b6fe59b.tgz", + "integrity": "sha512-lp+rlcNE3DfS9Pua6imdtFqmVyNztiJPLvcgv1XKg2yRHhWdzNfvufbAWtPq5i4ZjcIPlCvydDgABDof3YGDMg==", "requires": { "event-emitter": "^0.3.5", "minimatch": "3.0.4", diff --git a/package.json b/package.json index 4c9d809ec..88eb6fe93 100644 --- a/package.json +++ b/package.json @@ -24,10 +24,10 @@ }, "private": true, "dependencies": { - "@alfresco/adf-content-services": "4.2.0", - "@alfresco/adf-core": "4.2.0", - "@alfresco/adf-extensions": "4.2.0", - "@alfresco/js-api": "4.2.0", + "@alfresco/adf-content-services": "4.3.0-2839e9faf2e7832078e0b2f40a42308b45dc2f1e", + "@alfresco/adf-core": "4.3.0-2839e9faf2e7832078e0b2f40a42308b45dc2f1e", + "@alfresco/adf-extensions": "4.3.0-2839e9faf2e7832078e0b2f40a42308b45dc2f1e", + "@alfresco/js-api": "4.3.0-fc33b5aba2cdfe131d2f061049691b5e5b6fe59b", "@angular/animations": "10.0.4", "@angular/cdk": "^10.0.2", "@angular/common": "10.0.4", @@ -56,8 +56,8 @@ "zone.js": "~0.10.2" }, "devDependencies": { - "@alfresco/adf-cli": "4.2.0", - "@alfresco/adf-testing": "4.2.0", + "@alfresco/adf-cli": "4.3.0-2839e9faf2e7832078e0b2f40a42308b45dc2f1e", + "@alfresco/adf-testing": "4.3.0-2839e9faf2e7832078e0b2f40a42308b45dc2f1e", "@angular-custom-builders/lite-serve": "^0.2.2", "@angular-devkit/build-angular": "^0.1002.0", "@angular-devkit/build-ng-packagr": "^0.1002.0", diff --git a/scripts/ci/job_hooks/after_e2e.sh b/scripts/ci/job_hooks/after_e2e.sh index a85f2496d..a0a0a8e77 100755 --- a/scripts/ci/job_hooks/after_e2e.sh +++ b/scripts/ci/job_hooks/after_e2e.sh @@ -2,3 +2,5 @@ # 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" + +./node_modules/@alfresco/adf-cli/bin/adf-cli scan-env --host "$API_CONTENT_HOST" -u "$ADMIN_EMAIL" -p "$ADMIN_PASSWORD" diff --git a/scripts/ci/job_hooks/before_e2e.sh b/scripts/ci/job_hooks/before_e2e.sh index b67724988..2fbedb653 100755 --- a/scripts/ci/job_hooks/before_e2e.sh +++ b/scripts/ci/job_hooks/before_e2e.sh @@ -4,6 +4,9 @@ FROM=$1; TO=$2; 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 =====" ./node_modules/@alfresco/adf-cli/bin/adf-cli check-cs-env --host "$API_CONTENT_HOST" -u "$ADMIN_EMAIL" -p "$ADMIN_PASSWORD" || exit 1