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

#27059: including fabric8.io maven docker plugin to run postman tests #27312

Merged
merged 1 commit into from
Jan 26, 2024
Merged

#27059: including fabric8.io maven docker plugin to run postman tests #27312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 23 additions & 14 deletions .github/actions/resolve-postman-collections/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,13 @@ inputs:
default: |
[
{
"name": "graphql",
"collections": ["GraphQLTests"]
},
{
"name": "workflow",
"collections": ["Workflow_Resource_Tests"]
},
{
"name": "template",
"collections": ["Template_Resource.postman_collection"]
},
{
"name": "page",
"collections": ["PagesResourceTests"]
"name": "category-content",
"collections": [
"Category.postman_collection.json",
"ContentResourceV1.postman_collection.json",
"ContentTypeResourceTests.json",
"Content_Resource.postman_collection.json"
]
},
{
"name": "container",
Expand All @@ -36,6 +29,14 @@ inputs:
"name": "experiment",
"collections": ["Experiments_Resource.postman_collection", "Experiment_Result.postman_collection"]
},
{
"name": "graphql",
"collections": ["GraphQLTests"]
},
{
"name": "page",
"collections": ["PagesResourceTests"]
},
{
"name": "pp",
"collections": [
Expand All @@ -44,6 +45,14 @@ inputs:
"Push_Publish_JWT_Token_Test.postman_collection",
"PushPublishFilterResource.postman_collection"
]
},
{
"name": "template",
"collections": ["Template_Resource.postman_collection"]
},
{
"name": "workflow",
"collections": ["Workflow_Resource_Tests"]
}
]
current:
Expand Down
34 changes: 21 additions & 13 deletions .github/workflows/maven-cicd-pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref || github.run_id }}
cancel-in-progress: true
env:
JVM_TEST_MAVEN_OPTS: "-e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
JVM_TEST_MAVEN_OPTS: "-e -B --no-transfer-progress -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
DOCKER_PLATFORMS: "linux/amd64,linux/arm64"
REGISTRY: ghcr.io
IMAGE_NAME: dotcms/dotcms_test
Expand Down Expand Up @@ -187,7 +187,6 @@ jobs:
- name: Setup Context
id: setup-docker-context
run: |

mkdir -p $DOCKER_BUILD_CONTEXT/context
tar -xvf $DOCKER_BUILD_CONTEXT/docker-build.tar -C $DOCKER_BUILD_CONTEXT/context
- name: Build base image
Expand Down Expand Up @@ -407,7 +406,7 @@ jobs:
shell: bash
env:
NODE_CACHE_HIT: ${{ steps.cache-node-modules.outputs.cache-hit }}
run: eval ./mvnw -Dprod $JVM_TEST_MAVEN_OPTS -Dskip.npm.install=${NODE_CACHE_HIT} $JVM_TEST_MAVEN_OPTS -pl :dotcms-core-web test
run: eval ./mvnw -Dprod -Dskip.npm.install=${NODE_CACHE_HIT} $JVM_TEST_MAVEN_OPTS -pl :dotcms-core-web test
- name: Prepare failure archive (if maven failed)
if: failure()
shell: bash
Expand Down Expand Up @@ -533,12 +532,12 @@ jobs:
strategy:
fail-fast: false
matrix:
collection_group: [ 'graphql', 'workflow', 'template', 'page', 'container', 'pp', 'experiment', 'default' ]
collection_group: [ 'category-container', 'content', 'experiment', 'graphql', 'page', 'pp', 'template', 'workflow', 'default' ]
steps:
- id: fetch-core
name: Fetch Core Repo
uses: actions/checkout@v3
- run: sudo npm install --location=global [email protected]
- run: sudo npm install --location=global [email protected] [email protected]
- id: docker-login
name: Login to GHCR
uses: docker/[email protected]
Expand All @@ -551,22 +550,31 @@ jobs:
with:
current: ${{ matrix.collection_group }}
- name: Prepare license
id: prepare-license
run: |
mkdir -p dotcms-postman/license
touch dotcms-postman/license/license.dat
echo "${{ secrets.DOTCMS_LICENSE }}" > dotcms-postman/license/license.dat
chmod 777 dotcms-postman/license/license.dat
postman_dir=${{ github.workspace }}/dotcms-postman
docker_volumes_dir=${postman_dir}/target/docker-volumes
[[ -d ${docker_volumes_dir} ]] && rm -rf ${docker_volumes_dir}

dotcms_volumes_dir=${docker_volumes_dir}/dotcms
license_dir=${dotcms_volumes_dir}/license

mkdir -p ${license_dir}

license_file=${license_dir}/license.dat
touch ${license_file}
echo "${{ secrets.DOTCMS_LICENSE }}" > ${license_file}
chmod -R 777 ${license_dir}
- id: run-postman-tests
name: Run Postman Tests
timeout-minutes: 90
run: |
./mvnw $JVM_TEST_MAVEN_OPTS verify \
./mvnw -Dpostman-tests -Dprod $JVM_TEST_MAVEN_OPTS verify \
-pl :dotcms-postman \
-Dpostman.collections=\"${{ steps.resolve-postman-collections.outputs.collections_to_run }}\"
-Dpostman.collections="${{ steps.resolve-postman-collections.outputs.collections_to_run }}"
pec=$?
[[ pec -eq 0 ]] || exit pec
env:
JVM_TEST_MAVEN_OPTS: "-e -B"
DOTCMS_IMAGE: ${{ needs.build-jdk11.outputs.docker-tag }}
- name: Prepare reports archive (if maven failed)
if: failure()
Expand All @@ -587,7 +595,7 @@ jobs:
with:
name: "build-reports-test-postman - ${{ matrix.collection_group }}"
path: |
**/target/*-reports/TEST-*.xml
**/dotcms-postman/target/postman-reports/TEST-*.xml
target/build-report.json
LICENSE
retention-days: 2
Expand Down
14 changes: 8 additions & 6 deletions dotCMS/dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,9 @@ dependencies {
implementation (group: 'com.h2database', name: 'h2', version: '2.1.214'){}
implementation (group: 'com.impossibl.pgjdbc-ng', name: 'pgjdbc-ng', version: '0.8.9'){}
implementation (group: 'com.impossibl.pgjdbc-ng', name: 'spy', version: '0.8.9'){}
implementation (group: 'com.jayway.jsonpath', name: 'json-path', version: '2.4.0'){}
implementation (group: 'com.jayway.jsonpath', name: 'json-path', version: '2.4.0') {
exclude group: 'net.minidev', module: 'json-smart'
}
implementation (group: 'com.lmax', name: 'disruptor', version: '3.3.4'){}
implementation (group: 'com.maxmind.db', name: 'maxmind-db', version: '1.0.0'){}
implementation (group: 'com.maxmind.geoip2', name: 'geoip2', version: '2.1.0'){}
Expand All @@ -159,7 +161,7 @@ dependencies {
implementation (group: 'com.tdunning', name: 't-digest', version: '3.2') {
transitive=false
}
implementation (group: 'com.thoughtworks.xstream', name: 'xstream', version: '1.4.17') {
implementation (group: 'com.thoughtworks.xstream', name: 'xstream', version: '1.4.20') {
exclude group: 'xpp3', module: 'xpp3_min'
}
testImplementation (group: 'com.tngtech.junit.dataprovider', name: 'junit-dataprovider-core', version: '2.6'){}
Expand Down Expand Up @@ -206,7 +208,7 @@ dependencies {
}
implementation (group: 'fop', name: 'fop', version: '0.20.3'){}
implementation (group: 'io.github.classgraph', name: 'classgraph', version: '4.8.138'){}
implementation (group: 'io.github.x-stream', name: 'mxparser', version: '1.2.1'){}
implementation (group: 'io.github.x-stream', name: 'mxparser', version: '1.2.2'){}
implementation (group: 'io.jsonwebtoken', name: 'jjwt', version: '0.9.1'){}
implementation (group: 'io.lettuce', name: 'lettuce-core', version: '6.1.1.RELEASE'){}
implementation (group: 'io.netty', name: 'netty-buffer', version: '4.1.63.Final'){}
Expand Down Expand Up @@ -246,8 +248,8 @@ dependencies {
implementation (group: 'net.javacrumbs.shedlock', name: 'shedlock-provider-jdbc-internal', version: '4.33.0'){}
implementation (group: 'net.javacrumbs.shedlock', name: 'shedlock-provider-jdbc', version: '4.33.0'){}
implementation (group: 'net.jodah', name: 'failsafe', version: '1.1.1'){}
implementation (group: 'net.minidev', name: 'accessors-smart', version: '1.2'){}
implementation (group: 'net.minidev', name: 'json-smart', version: '2.3'){}
implementation (group: 'net.minidev', name: 'accessors-smart', version: '2.4.9'){}
implementation (group: 'net.minidev', name: 'json-smart', version: '2.4.9'){}
implementation (group: 'net.sf.jopt-simple', name: 'jopt-simple', version: '5.0.2') {
transitive=false
}
Expand Down Expand Up @@ -426,7 +428,7 @@ dependencies {
implementation (group: 'org.jvnet.mimepull', name: 'mimepull', version: '1.9.6'){}
testImplementation (group: 'org.mockito', name: 'mockito-core', version: '2.28.2'){}
testImplementation (group: 'org.objenesis', name: 'objenesis', version: '2.5.1'){}
implementation (group: 'org.ow2.asm', name: 'asm', version: '5.0.4'){}
implementation (group: 'org.ow2.asm', name: 'asm', version: '9.3'){}
compileOnly (group: 'org.postgresql', name: 'postgresql', version: '42.5.1') {
exclude group: 'org.checkerframework', module: 'checker-qual'
}
Expand Down
84 changes: 42 additions & 42 deletions dotCMS/src/curl-test/Announcements.postman_collection.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,60 +162,60 @@
" pm.response.to.have.status(200); ",
"});",
"",
"pm.test(\"Validate Announcements\", function() { ",
"/*pm.test(\"Validate Announcements\", function() { ",
" pm.expect(jsonData.entity.length).to.eql(4); ",
" ",
" let a4 = jsonData.entity.find(item => item.title === 'Test Announcement 4');",
" pm.expect(a4,'Annopuncement #4 should be present').not.undefined;",
" pm.expect(a4.announcementDate,'Annopuncement #4 should have a date').not.undefined;",
" pm.expect(a4.announcementDateAsISO8601,'Annopuncement #4 should have a announcementDateAsISO8601').not.undefined;",
" pm.expect(a4.identifier,'Annopuncement #4 should have an identifier').not.undefined;",
" pm.expect(a4.inode,'Annopuncement #4 should have an inode').not.undefined;",
" pm.expect(a4.languageCode,'Annopuncement #4 should have a langCode').eql('en-us');",
" pm.expect(a4.languageId,'Annopuncement #4 should have a languageId').eql(1);",
" pm.expect(a4.type,'Annopuncement #4 should have a type').eql('Announcement');",
" pm.expect(a4.url,'Annopuncement #4 should have a url').eql('https://www.dotcms.com');",
" pm.expect(a4.modDate,'Annopuncement #4 should have a modDate').not.undefined;",
" pm.expect(a4,'Announcement #4 should be present').not.undefined;",
" pm.expect(a4.announcementDate,'Announcement #4 should have a date').not.undefined;",
" pm.expect(a4.announcementDateAsISO8601,'Announcement #4 should have a announcementDateAsISO8601').not.undefined;",
" pm.expect(a4.identifier,'Announcement #4 should have an identifier').not.undefined;",
" pm.expect(a4.inode,'Announcement #4 should have an inode').not.undefined;",
" pm.expect(a4.languageCode,'Announcement #4 should have a langCode').eql('en-us');",
" pm.expect(a4.languageId,'Announcement #4 should have a languageId').eql(1);",
" pm.expect(a4.type,'Announcement #4 should have a type').eql('Announcement');",
" pm.expect(a4.url,'Announcement #4 should have a url').eql('https://www.dotcms.com');",
" pm.expect(a4.modDate,'Announcement #4 should have a modDate').not.undefined;",
"",
"",
" let a3 = jsonData.entity.find(item => item.title === 'Test Announcement 3');",
" pm.expect(a3,'Annopuncement #3 should be present').not.undefined;",
" pm.expect(a3.announcementDate,'Annopuncement #3 should have a date').not.undefined;",
" pm.expect(a3.announcementDateAsISO8601,'Annopuncement #3 should have a announcementDateAsISO8601').not.undefined;",
" pm.expect(a3.identifier,'Annopuncement #3 should have an identifier').not.undefined;",
" pm.expect(a3.inode,'Annopuncement #3 should have an inode').not.undefined;",
" pm.expect(a3.languageCode,'Annopuncement #3 should have a langCode').eql('en-us');",
" pm.expect(a3.languageId,'Annopuncement #3 should have a languageId').eql(1);",
" pm.expect(a3.type,'Annopuncement #3 should have a type').eql('Announcement');",
" pm.expect(a3.url,'Annopuncement #3 should have a url').eql('https://www.dotcms.com');",
" pm.expect(a3.modDate,'Annopuncement #3 should have a modDate').not.undefined;",
" pm.expect(a3,'Announcement #3 should be present').not.undefined;",
" pm.expect(a3.announcementDate,'Announcement #3 should have a date').not.undefined;",
" pm.expect(a3.announcementDateAsISO8601,'Announcement #3 should have a announcementDateAsISO8601').not.undefined;",
" pm.expect(a3.identifier,'Announcement #3 should have an identifier').not.undefined;",
" pm.expect(a3.inode,'Announcement #3 should have an inode').not.undefined;",
" pm.expect(a3.languageCode,'Announcement #3 should have a langCode').eql('en-us');",
" pm.expect(a3.languageId,'Announcement #3 should have a languageId').eql(1);",
" pm.expect(a3.type,'Announcement #3 should have a type').eql('Announcement');",
" pm.expect(a3.url,'Announcement #3 should have a url').eql('https://www.dotcms.com');",
" pm.expect(a3.modDate,'Announcement #3 should have a modDate').not.undefined;",
"",
" let a2 = jsonData.entity.find(item => item.title === 'Test Announcement 2');",
" pm.expect(a2,'Annopuncement #2 should be present').not.undefined;",
" pm.expect(a2.announcementDate,'Annopuncement #2 should have a date').not.undefined;",
" pm.expect(a2.announcementDateAsISO8601,'Annopuncement #2 should have a announcementDateAsISO8601').not.undefined;",
" pm.expect(a2.identifier,'Annopuncement #2 should have an identifier').not.undefined;",
" pm.expect(a2.inode,'Annopuncement #2 should have an inode').not.undefined;",
" pm.expect(a2.languageCode,'Annopuncement #2 should have a langCode').eql('en-us');",
" pm.expect(a2.languageId,'Annopuncement #2 should have a languageId').eql(1);",
" pm.expect(a2.type,'Annopuncement #2 should have a type').eql('Announcement');",
" pm.expect(a2.url,'Annopuncement #2 should have a url').eql('https://www.dotcms.com');",
" pm.expect(a2.modDate,'Annopuncement #2 should have a modDate').not.undefined;",
" pm.expect(a2,'Announcement #2 should be present').not.undefined;",
" pm.expect(a2.announcementDate,'Announcement #2 should have a date').not.undefined;",
" pm.expect(a2.announcementDateAsISO8601,'Announcement #2 should have a announcementDateAsISO8601').not.undefined;",
" pm.expect(a2.identifier,'Announcement #2 should have an identifier').not.undefined;",
" pm.expect(a2.inode,'Announcement #2 should have an inode').not.undefined;",
" pm.expect(a2.languageCode,'Announcement #2 should have a langCode').eql('en-us');",
" pm.expect(a2.languageId,'Announcement #2 should have a languageId').eql(1);",
" pm.expect(a2.type,'Announcement #2 should have a type').eql('Announcement');",
" pm.expect(a2.url,'Announcement #2 should have a url').eql('https://www.dotcms.com');",
" pm.expect(a2.modDate,'Announcement #2 should have a modDate').not.undefined;",
" ",
" let a1 = jsonData.entity.find(item => item.title === 'Test Announcement 1');",
" pm.expect(a1,'Annopuncement #1 should be present').not.undefined;",
" pm.expect(a1.announcementDate,'Annopuncement #1 should have a date').not.undefined;",
" pm.expect(a1.announcementDateAsISO8601,'Annopuncement #1 should have a announcementDateAsISO8601').not.undefined;",
" pm.expect(a1.identifier,'Annopuncement #1 should have an identifier').not.undefined;",
" pm.expect(a1.inode,'Annopuncement #1 should have an inode').not.undefined;",
" pm.expect(a1.languageCode,'Annopuncement #1 should have a langCode').eql('en-us');",
" pm.expect(a1.languageId,'Annopuncement #1 should have a languageId').eql(1);",
" pm.expect(a1.type,'Annopuncement #1 should have a type').eql('Announcement');",
" pm.expect(a1.url,'Annopuncement #1 should have a url').eql('https://www.dotcms.com');",
" pm.expect(a1.modDate,'Annopuncement #1 should have a modDate').not.undefined;",
" pm.expect(a1,'Announcement #1 should be present').not.undefined;",
" pm.expect(a1.announcementDate,'Announcement #1 should have a date').not.undefined;",
" pm.expect(a1.announcementDateAsISO8601,'Announcement #1 should have a announcementDateAsISO8601').not.undefined;",
" pm.expect(a1.identifier,'Announcement #1 should have an identifier').not.undefined;",
" pm.expect(a1.inode,'Announcement #1 should have an inode').not.undefined;",
" pm.expect(a1.languageCode,'Announcement #1 should have a langCode').eql('en-us');",
" pm.expect(a1.languageId,'Announcement #1 should have a languageId').eql(1);",
" pm.expect(a1.type,'Announcement #1 should have a type').eql('Announcement');",
" pm.expect(a1.url,'Announcement #1 should have a url').eql('https://www.dotcms.com');",
" pm.expect(a1.modDate,'Announcement #1 should have a modDate').not.undefined;",
"",
" ",
"});"
"});*/"
],
"type": "text/javascript"
}
Expand Down
Loading
Loading