Skip to content

Commit

Permalink
Migration of the cdi-tck/web tests to the platform tck repo main bran…
Browse files Browse the repository at this point in the history 
…chCdi tck (jakartaee#1432)

* Remove wf-core-tck-runner

Signed-off-by: Scott Marlow <smarlow@redhat.com>

* Add new WildFly wf-core-tck-runner submodule using https://github.com/wildfly/wildfly-tck-runners/tree/main/wf-core-tck-runner

Signed-off-by: Scott Marlow <smarlow@redhat.com>

* Update README.adoc to explain the git submodule deinit command and also change WildFly Preview to WildFly

Signed-off-by: Scott Marlow <smarlow@redhat.com>

* [1135] Do not add the CustomJsonbResolver as a service provider for a JsonbProvider.

Signed-off-by: James R. Perkins <jperkins@redhat.com>

* [1134] Allow the response type to be either 400 or 500. In Jakarta RESTful Web Services 3.1 a default ExceptionMapper is required. The suggestion of the specification is to return 500 as the response status.

Signed-off-by: James R. Perkins <jperkins@redhat.com>

* Prepare release notes for a 10.0.1 core profile tck release

Signed-off-by: Scott M Stark <starksm64@gmail.com>

* Update version to 10.0.1

Signed-off-by: Scott M Stark <starksm64@gmail.com>

* Accept unique constraint as part of the create table statement

* Fixed RESULT_FILE_NAME variable

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>

* New Dockerfile 0.4, updated Jenkinsfile, fixed bash script

- previous version
  - used root to run builds
  - had no permissions to write to the home dir
  - had no permissions to kill processes
- this version
  - prints useful information about user, network, env
  - uses user tck based on Jenkins user (see Elipses' documentation)
  - added AS_TRACE parameter, useful when GF asadmin behaves badly
  - with fixed GlassFish (PR24200) doesn't need to kill (but for sure...)

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>

* JUnit reports archive was created in user's home instead of a workspace dir

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>

* JPA#391 Fix wrongly typed comparison expressions

* ClassLoader issue in embedded Arquillian

Signed-off-by: Jorge Bescos Gascon <jorge.bescos.gascon@oracle.com>

* Upgrade to CDI TCK 4.0.10

Also updated associated dependencies and plugins in pom.

Signed-off-by: Arjan Tijms <arjan.tijms@omnifish.ee>

* Null check

Signed-off-by: Jorge Bescos Gascon <jorge.bescos.gascon@oracle.com>

* update configuration to exclude JPMS by disabling module and to use classpath. (jakartaee#1211)

Signed-off-by: Gurunandan Rao <gurunandan.rao@oracle.com>

* Bump testng from 7.4.0 to 7.5.1 in /glassfish-runner/cdi-tck (jakartaee#1173)

Bumps [testng](https://github.com/cbeust/testng) from 7.4.0 to 7.5.1.
- [Release notes](https://github.com/cbeust/testng/releases)
- [Changelog](https://github.com/testng-team/testng/blob/master/CHANGES.txt)
- [Commits](testng-team/testng@7.4.0...7.5.1)

---
updated-dependencies:
- dependency-name: org.testng:testng
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump testng from 7.4.0 to 7.5.1 in /core-profile-tck (jakartaee#1174)

Bumps [testng](https://github.com/cbeust/testng) from 7.4.0 to 7.5.1.
- [Release notes](https://github.com/cbeust/testng/releases)
- [Changelog](https://github.com/testng-team/testng/blob/master/CHANGES.txt)
- [Commits](testng-team/testng@7.4.0...7.5.1)

---
updated-dependencies:
- dependency-name: org.testng:testng
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump testng from 7.4.0 to 7.5.1 in /glassfish-runner/concurrency-tck (jakartaee#1172)

Bumps [testng](https://github.com/cbeust/testng) from 7.4.0 to 7.5.1.
- [Release notes](https://github.com/cbeust/testng/releases)
- [Changelog](https://github.com/testng-team/testng/blob/master/CHANGES.txt)
- [Commits](testng-team/testng@7.4.0...7.5.1)

---
updated-dependencies:
- dependency-name: org.testng:testng
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Initial migration of the cdi-tck/web tests to the platform tck repo (jakartaee#1220)

* Intial prototype of breaking up TCK into a core and web profile set of tests

Signed-off-by: Scott M Stark <starksm64@gmail.com>

* Merge from master and get working with weld master

Signed-off-by: Scott M Stark <starksm64@gmail.com>

* Update the 10 year old htmlunit to the most recent version

Signed-off-by: Scott M Stark <starksm64@gmail.com>

* Move more TestGroups.INTEGRATION tests into the web collection

Signed-off-by: Scott M Stark <starksm64@gmail.com>

* Prepare for the 4.1.0.Alpha1 release

Signed-off-by: Scott M Stark <starksm64@gmail.com>

* Try this again, need snapshot for release plugin

Signed-off-by: Scott M Stark <starksm64@gmail.com>

* [maven-release-plugin] prepare release 4.1.0.Alpha1

* [maven-release-plugin] prepare for next development iteration

* Add comment about the testResourceBeanTypes types check assert along with the types actually seen

Signed-off-by: Scott M Stark <starksm64@gmail.com>

* Build expected Boolean types from JVM class to avoid issues with future java.lang type changes

Signed-off-by: Scott M Stark <starksm64@gmail.com>
jakartaee#238

* Update persistence.xml schema to Jakarta EE 9 version

Signed-off-by: Scott M Stark <starksm64@gmail.com>

* Update CDI API to 4.0.0.Alpha1; rework tests that use now removed APIs.

* [maven-release-plugin] prepare release 4.1.0.Alpha2

* [maven-release-plugin] prepare for next development iteration

* Changes to support test archive source for cdi-lite

Signed-off-by: Scott M Stark <starksm64@gmail.com>

* Changes to support test archive source for cdi-lite

Signed-off-by: Scott M Stark <starksm64@gmail.com>

* First pass aadding cdi-full group to @decorators tests (jakartaee#279)

* First pass aadding cdi-full group to @decorators tests
Addresses jakartaee#263

Signed-off-by: Scott M Stark <starksm64@gmail.com>

* Move/rework/alter tests using CDI extensions, part 2

* Move/rework/alter tests using CDI extensions, part 3

* Move/rework/alter tests using CDI extensions, part 4

* Move/rework/alter tests using CDI extensions, part 5

* Second pass at adding cdi-full to interceptors tests (jakartaee#285)

* Update most tests to not use @interceptors so they work in Lite and full.
* Move cdi-full group tests to under org.jboss.cdi.tck.tests.full.interceptors.*

Signed-off-by: Scott M Stark <starksm64@gmail.com>

* Move more decorator related tests to cdi-full, jakartaee#290 (jakartaee#291)

* More decorator related tests need the cdi-full test group
Addresses jakartaee#290, jakartaee#273

Signed-off-by: Scott M Stark <starksm64@gmail.com>

* [maven-release-plugin] prepare release 4.1.0.Alpha3

* [maven-release-plugin] prepare for next development iteration

* Change BeanDiscovery test to account for beans.xml version attribute changes. Expand BeansXml util to allow creation of XML without certain attributes.

* Merge the two BeanDiscoveryTest classes together as they both test plain CDI Full features anyway.

* remove SourceProcessor and everything related

The `cdiLiteMode` flag is retained, because that seems to be useful.
Everything else should be gone with this commit.

* Adapt TCK Full and incontainer tests to new beans.xml defaults.

* Revert the dev version from 4.1.0-SNAPSHOT to 4.0.0-SNAPSHOT to correct the current major/minor mismatch between api/tck

Signed-off-by: starksm64 <starksm64@gmail.com>

* [maven-release-plugin] prepare release 4.0.0.Alpha4

* [maven-release-plugin] prepare for next development iteration

* Add ability to skip adding beans.xml to the archive

* Revert mistakenly commited change to web.xml file.

* [maven-release-plugin] prepare release 4.0.0.Alpha5

* [maven-release-plugin] prepare for next development iteration

* [maven-release-plugin] prepare release 4.0.0-RC1

* [maven-release-plugin] prepare for next development iteration

* Update signature test packages and Java version to 11.
Remove the duplicate sigtest-pom.xml from the web module.
Update the TCK guide version references, examples and add lang model TCK section

Signed-off-by: starksm64 <starksm64@gmail.com>

* [maven-release-plugin] prepare release 4.0.0-RC1

* [maven-release-plugin] prepare for next development iteration

* [maven-release-plugin] prepare release 4.0.0-RC2

* [maven-release-plugin] prepare for next development iteration

* [maven-release-plugin] prepare release 4.0.0-RC3

* [maven-release-plugin] prepare for next development iteration

* Move some misplaced tests under full package, add CDI_FULL category. Rework few other tests to work equally for Lite and Full. (jakartaee#338)

* [maven-release-plugin] prepare release 4.0.0-RC4

* [maven-release-plugin] prepare for next development iteration

* [maven-release-plugin] prepare release 4.0.0.RC5

* [maven-release-plugin] prepare for next development iteration

* [maven-release-plugin] prepare release 4.0.0.RC6

* [maven-release-plugin] prepare for next development iteration

* [maven-release-plugin] prepare release 4.0.0

* [maven-release-plugin] prepare for next development iteration

* [maven-release-plugin] prepare release 4.0.0

* [maven-release-plugin] prepare for next development iteration

* [maven-release-plugin] prepare release 4.0.0-RC7

* [maven-release-plugin] prepare for next development iteration

* IntrospectServlet needs to be a bean for JEEComponentTest

This used to be a bean because we used discovery mode all. However, the
default discovery mode has changed in 4.0 to be annotated, so the class
needs an annotation to be a bean.

* [maven-release-plugin] prepare release 4.0.0-RC8

* [maven-release-plugin] prepare for next development iteration

* [maven-release-plugin] prepare release 4.0.0-RC8

* [maven-release-plugin] prepare for next development iteration

* [maven-release-plugin] prepare release 4.0.0

* [maven-release-plugin] prepare for next development iteration

* Set discovery-mode=all for non.contextual.ContainerEventTest

This test relies on unannotated classes being discovered and so needs
discovery-mode=all.

This now needs to be added explicitly because the default was changed to
discovery-mode=annotated.

* Revert change to InvalidatingSessionDestroysConversationTest

Request clouds.jsf rather than clouds.xhtml so that the request matches
the pattern for the faces servlet.

* [maven-release-plugin] prepare release 4.0.1

* [maven-release-plugin] prepare for next development iteration

* Update for removeal of managed beans, faces in jsp

Signed-off-by: Scott M Stark <starksm64@gmail.com>

* Migrate another jsp test using jsf

Signed-off-by: Scott M Stark <starksm64@gmail.com>

* Address removal of managed beans/faces in jsp (jakartaee#374)

* Update for removeal of managed beans, faces in jsp
* Migrate another jsp test using jsf

Signed-off-by: Scott M Stark <starksm64@gmail.com>

* Update versions to final for all specs

Signed-off-by: Scott M Stark <starksm64@gmail.com>

* Update missing final versions (jakartaee#375)

* Update for removeal of managed beans, faces in jsp
* Migrate another jsp test using jsf
* Update versions to final for all specs

Signed-off-by: Scott M Stark <starksm64@gmail.com>

* [maven-release-plugin] prepare release 4.0.2

* [maven-release-plugin] prepare for next development iteration

* Move the test-audit dependencies into the plugin using them

Signed-off-by: Scott M Stark <starksm64@gmail.com>

* [maven-release-plugin] prepare release 4.0.3

* [maven-release-plugin] prepare for next development iteration

* [maven-release-plugin] prepare release 4.0.3

* [maven-release-plugin] prepare for next development iteration

* [maven-release-plugin] prepare release 4.0.3

* [maven-release-plugin] prepare for next development iteration

* Fix PersistenceContextInjectionTest to include AutoCloseable as type of EM and EMF (jakartaee#381)

* [maven-release-plugin] prepare release 4.0.4

* [maven-release-plugin] prepare for next development iteration

* [maven-release-plugin] prepare release 4.0.5

* [maven-release-plugin] prepare for next development iteration

* [maven-release-plugin] prepare release 4.0.5

* [maven-release-plugin] prepare for next development iteration

* [maven-release-plugin] prepare release 4.0.5

* [maven-release-plugin] prepare for next development iteration

* More test-audit workarounds

Signed-off-by: Scott M Stark <starksm64@gmail.com>

* [maven-release-plugin] prepare release 4.0.5

* [maven-release-plugin] prepare for next development iteration

* Disable the tck-audit profile by default so that the org.jboss.test-a… (jakartaee#388)

* Disable the tck-audit profile by default so that the org.jboss.test-audit dependencies are not seen by default in the TCK test artifact dependencies.
The build needs -DgenerateSource to run with this change
* Update the action build set for tck-audit activation

Signed-off-by: Scott M Stark <starksm64@gmail.com>

* Revert "Disable the tck-audit profile by default so that the org.jboss.test-a… (jakartaee#388)"

This reverts commit 22d9a76199356b8da8827ed76f415ef1ff45f107.

* Fixed tests to disabling thrown of FailingHttpStatusCode exception

* [maven-release-plugin] prepare release 4.0.6

* [maven-release-plugin] prepare for next development iteration

* [maven-release-plugin] prepare release 4.0.7

* [maven-release-plugin] prepare for next development iteration

* Add Support for Selenium Tests
- Adds Selenium implementation for Faces Ajax test

* [maven-release-plugin] prepare release 4.0.8

* [maven-release-plugin] prepare for next development iteration

* [maven-release-plugin] prepare release 4.0.8

* [maven-release-plugin] prepare for next development iteration

* Selenium Fix for Chromium v111+

* [maven-release-plugin] prepare release 4.0.9

* [maven-release-plugin] prepare for next development iteration

* fix version string after incorrect 4.0.9 release

* [maven-release-plugin] prepare release 4.0.10

* [maven-release-plugin] prepare for next development iteration

* Change ProcessBeanAttributesNotFiredForBuiltinBean to only detect PBA for beans with @default qualifiers

* Change main branch to 4.1 version

* Fix invalid annotation literals

The `Annotation.equals()` contract directly states that for two
annotation objects to be equal, they must (among others) both
implement the [same] annotation interface.

The CDI TCK used to create instances of memberless annotations
simply by instantiating an anonymous subclass of `AnnotationLiteral`,
which doesn't implement the annotation interface and hence is invalid.

It has never been a problem, because `AnnotationLiteral` implements
equality in a slightly more permissive manner: instead of checking
that both objects implement the same annotation interface, it checks
that both objects are annotations that have an equal `annotationType()`.
It becomes problematic when an implementation uses a different mechanism
to instantiate annotations than extending `AnnotationLiteral`, one that
closely follows the `Annotation` contract.

This commit replaces all usages of such anonymous subclasses by
proper `AnnotationLiteral` subclasses that implement the annotation
interface as well.

* add the CreationalContexts SPI

This commit also removes a few outdated references to Web Beans.

* add the Contextuals SPI

* Revisit two TCK tests that were disable in non-standard manner

* Add tests for InvocationContext.getInterceptorBindings()

* [maven-release-plugin] prepare release 4.1.0.Alpha4

* [maven-release-plugin] prepare for next development iteration

* [maven-release-plugin] prepare release 4.1.0.Alpha5

* [maven-release-plugin] prepare for next development iteration

* Relax the scope requirement for public fields

This is a TCK counterpart to the specification change that allows all
pseudo-scoped beans to have public fields. It updates the text
in `tck-audit-cdi.xml` files, fixes naming in the relevant tests
and adds a test that a `@Singleton` bean can have a public field.

* Updates for the 4.1.0-M1 release (jakartaee#504)

* Updates for the 4.1.0-M1 release
* Web tck dependencies require Java SE 17+

---------

Signed-off-by: Scott M Stark <starksm64@gmail.com>

* Fix se 17 javadoc error (jakartaee#510)

add javadoc to the non-stage ci build

Signed-off-by: Scott M Stark <starksm64@gmail.com>

* [maven-release-plugin] prepare release 4.1.0-M1

* [maven-release-plugin] prepare for next development iteration

* [maven-release-plugin] prepare release 4.1.0-M1

* [maven-release-plugin] prepare for next development iteration

* Add test coverage for declaring @priority on producers

* synchronize exclusion lists in "impl" and "web" and add a test

* remove tck-tests-previous.xml files, they are not maintained

* remove the JBoss tagline from license headers

* Add missing copyright headers to Java files

Copyright owner and date was generated by finding the original author
and date from the git history.

* remove the reference to @ManagedBean

* Update web/src/main/resources/tck-audit-cdi.xml

Co-authored-by: Ladislav Thon <ladicek@gmail.com>

* Migrate the cdi-tck/web contents to the platform tck with history

Signed-off-by: Scott M Stark <starksm64@gmail.com>

* Initial migration of the https://github.com/jakartaee/cdi-tck/web tests to the platform tck

Signed-off-by: Scott M Stark <starksm64@gmail.com>

---------

Signed-off-by: Scott M Stark <starksm64@gmail.com>
Signed-off-by: starksm64 <starksm64@gmail.com>
Co-authored-by: Eclipse CDI Bot <cdi-bot@eclipse.org>
Co-authored-by: Matej Novotny <manovotn@redhat.com>
Co-authored-by: Ladislav Thon <lthon@redhat.com>
Co-authored-by: Andrew Rouse <anrouse@uk.ibm.com>
Co-authored-by: Alfonso Altamirano <alfonso.altamirano@payara.fish>
Co-authored-by: Brian Decker <bmdecker@us.ibm.com>
Co-authored-by: Emily Jiang <emijiang6@googlemail.com>
Co-authored-by: Ladislav Thon <ladicek@gmail.com>

* Migration of the cdi-tck/web tests to the platform tck repo main branch

Signed-off-by: Scott M Stark <starksm@starkinternational.com>

* Fix conflicts

Signed-off-by: Scott M Stark <starksm@starkinternational.com>

---------

Signed-off-by: Scott Marlow <smarlow@redhat.com>
Signed-off-by: James R. Perkins <jperkins@redhat.com>
Signed-off-by: Scott M Stark <starksm64@gmail.com>
Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
Signed-off-by: Jorge Bescos Gascon <jorge.bescos.gascon@oracle.com>
Signed-off-by: Arjan Tijms <arjan.tijms@omnifish.ee>
Signed-off-by: Gurunandan Rao <gurunandan.rao@oracle.com>
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: starksm64 <starksm64@gmail.com>
Signed-off-by: Scott M Stark <starksm@starkinternational.com>
Co-authored-by: Scott Marlow <smarlow@redhat.com>
Co-authored-by: James R. Perkins <jperkins@redhat.com>
Co-authored-by: Christian Beikov <christian.beikov@gmail.com>
Co-authored-by: David Matějček <david.matejcek@omnifish.ee>
Co-authored-by: Alwin Joseph <44426046+alwin-joseph@users.noreply.github.com>
Co-authored-by: Jorge Bescos Gascon <jorge.bescos.gascon@oracle.com>
Co-authored-by: Arjan Tijms <arjan.tijms@omnifish.ee>
Co-authored-by: Arjan Tijms <arjan.tijms@gmail.com>
Co-authored-by: Gurunandan Rao <gurunandan.rao@oracle.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Eclipse CDI Bot <cdi-bot@eclipse.org>
Co-authored-by: Matej Novotny <manovotn@redhat.com>
Co-authored-by: Ladislav Thon <lthon@redhat.com>
Co-authored-by: Andrew Rouse <anrouse@uk.ibm.com>
Co-authored-by: Alfonso Altamirano <alfonso.altamirano@payara.fish>
Co-authored-by: Brian Decker <bmdecker@us.ibm.com>
Co-authored-by: Emily Jiang <emijiang6@googlemail.com>
Co-authored-by: Ladislav Thon <ladicek@gmail.com>
  • Loading branch information
@starksm64 @scottmarlow
@jamezp @beikov @dmatej @alwin-joseph @jbescos @arjantijms @gurunrao @dependabot @eclipse-cdi-bot @manovotn @Ladicek @Azquelt @breakponchito @brideck @Emily-Jiang
19 people authored Aug 5, 2024
1 parent 1f2183d commit a38f4c9
Show file tree
Hide file tree
Showing 1,602 changed files with 93,036 additions and 29 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ target/
/glassfish-runner/batch-tck/apitests/test.properties
/glassfish-runner/batch-tck/sigtests/test.properties
.classpath
.factorypath
.settings/
classes/
dist/
Expand Down
2 changes: 1 addition & 1 deletion .gitmodules
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "core-profile-tck/examples/wf-core-tck-runner"]
path = core-profile-tck/examples/wf-core-tck-runner
url = https://github.com/jakartaredhat/wf-core-tck-runner.git
url = https://github.com/wildfly/wildfly-tck-runners
35 changes: 20 additions & 15 deletions Jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def generateCTSStage(job) {
container('jakartaeetck-ci') {
unstash 'jakartaeetck-bundles'
sh """
env
id && ant -version && mvn -version && ls -la ${HOME}/ && cat /etc/hosts && (env|sort)
unzip -q -o ${WORKSPACE}/jakartaeetck-bundles/*jakartaeetck*.zip -d ${CTS_HOME}
bash -x ${CTS_HOME}/jakartaeetck/docker/run_jakartaeetck.sh ${job} 2>&1 | tee ${CTS_HOME}/run_jakartaeetck.log
"""
Expand All @@ -63,7 +63,7 @@ def generateCTSStage(job) {
container('jakartaeetck-ci') {
unstash 'jakartaeetck-bundles'
sh """
env
id && ant -version && mvn -version && ls -la ${HOME}/ && cat /etc/hosts && (env|sort)
unzip -q -o ${WORKSPACE}/jakartaeetck-bundles/*jakartaeetck*.zip -d ${CTS_HOME}
bash -x ${CTS_HOME}/jakartaeetck/docker/run_jakartaeetck.sh ${job} 2>&1 | tee ${CTS_HOME}/run_cts.log
"""
Expand All @@ -90,7 +90,7 @@ def generateStandaloneTCKStage(job) {
checkout scm
unstash 'standalone-bundles'
sh """
env
id && ant -version && mvn -version && ls -la ${HOME}/ && cat /etc/hosts && (env|sort)
bash -x ${WORKSPACE}/docker/${job}tck.sh 2>&1 | tee ${WORKSPACE}/${job}tck.log
"""
archiveArtifacts artifacts: "*tck-results.tar.gz,*-junitreports.tar.gz,${job}tck.log",allowEmptyArchive: true
Expand Down Expand Up @@ -131,18 +131,20 @@ spec:
limits:
memory: "3Gi"
- name: jakartaeetck-ci
image: jakartaee/cts-base:0.3
image: jakartaee/cts-base:0.4
command:
- cat
tty: true
imagePullPolicy: Always
env:
- name: JAVA_TOOL_OPTIONS
value: -Xmx6G
resources:
limits:
memory: "10Gi"
cpu: "2.0"
securityContext:
runAsNonRoot: true
runAsUser: 1003270000
runAsGroup: 0
fsGroup: 1003270000
- name: james-mail
image: jakartaee/cts-mailserver:0.1
command:
Expand All @@ -166,14 +168,14 @@ spec:
string(name: 'GF_VERSION_URL',
defaultValue: '',
description: 'URL required for downloading GlassFish version details' )
string(name: 'OLD_GF_BUNDLE_URL',
string(name: 'OLD_GF_BUNDLE_URL',
defaultValue: '',
description: 'URL required for downloading Old GlassFish Full/Web profile bundle' )
string(name: 'TCK_BUNDLE_BASE_URL',
defaultValue: '',
defaultValue: '',
description: 'Base URL required for downloading prebuilt binary TCK Bundle from a hosted location' )
string(name: 'TCK_BUNDLE_FILE_NAME',
defaultValue: 'jakartaeetck.zip',
defaultValue: 'jakartaeetck.zip',
description: 'Name of bundle file to be appended to the base url' )
string(name: 'STANDALONE_TCK_BUNDLES_FILE_NAME_LIST',
defaultValue: '',
Expand All @@ -184,6 +186,8 @@ spec:
description: 'Java SE Version to be used for running TCK either JDK11/JDK17' )
choice(name: 'LICENSE', choices: 'EPL\nEFTL',
description: 'License file to be used to build the TCK bundle(s) either EPL(default) or Eclipse Foundation TCK License' )
choice(name: 'AS_TRACE', choices: 'false\ntrue',
description: 'Verbose logging of the asadmin command' )
choice(name: 'DATABASE', choices: 'JavaDB\nOracle\nMySQL',
description: 'Database to be used for running CTS. Currently only JavaDB is supported.' )
choice(name: 'BUILD_TYPE', choices: 'CTS\nSTANDALONE-TCK',
Expand All @@ -197,12 +201,13 @@ spec:
description: 'Optional keywords prefixed by joining operator - [&|] for filtering out the tests to run' )
}
environment {
CTS_HOME = "/root"
ANT_OPTS = "-Djavax.xml.accessExternalStylesheet=all -Djavax.xml.accessExternalSchema=all -Djavax.xml.accessExternalDTD=file,http"
CTS_HOME="/home/tck"
ANT_OPTS="-Djavax.xml.accessExternalStylesheet=all -Djavax.xml.accessExternalSchema=all -Djavax.xml.accessExternalDTD=file,http"
MAIL_USER="user01@james.local"
MAIL_HOST="localhost"
LANG="en_US.UTF-8"
DEFAULT_GF_BUNDLE_URL="https://download.eclipse.org/ee4j/glassfish/glassfish-7.0.0-SNAPSHOT-nightly.zip"
JAVA_TOOL_OPTIONS="-Djava.awt.headless=true"
}
stages {
stage('jakartaeetck-build') {
Expand All @@ -214,7 +219,7 @@ spec:
steps {
container('jakartaeetck-ci') {
sh """
env
id && ant -version && mvn -version && ls -la ${HOME}/ && cat /etc/hosts && (env|sort)
bash -x ${WORKSPACE}/docker/build_jakartaeetck.sh 2>&1 | tee ${WORKSPACE}/build_jakartaeetck.log
"""
archiveArtifacts artifacts: "jakartaeetck-bundles/*.zip,*.version,*.log", allowEmptyArchive: true
Expand All @@ -240,13 +245,13 @@ spec:
when {
expression {
return params.BUILD_TYPE == 'STANDALONE-TCK';
}
}
}

steps {
container('jakartaeetck-ci') {
sh """
env
id && ant -version && mvn -version && ls -la ${HOME}/ && cat /etc/hosts && (env|sort)
bash -x ${WORKSPACE}/docker/build_standalone-tcks.sh ${standalone_tcks} 2>&1 | tee ${WORKSPACE}/build_standalone-tcks.log
"""
archiveArtifacts artifacts: "standalone-bundles/*.zip,*.version,*.log", allowEmptyArchive: true
Expand Down
34 changes: 34 additions & 0 deletions cdi-ee-tck/README.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# CDI EE TCK Development


Check out the [TCK Reference Guide](https://jakartaee.github.io/cdi-tck/) to get acquainted with the CDI TCK and learn how to execute and debug it.

## Building CDI TCK artifacts
To build the CDI TCK artifacts, use:

`mvn install`

or when compiling against staged Jakarta artifacts:

`mvn -Pstaging install`

## Building the CDI TCK distribution
The CDI TCK distribution artifact is built by specifing an additional `-Drelease` property to build the TCK reference
documentation and distribution bundle, e.g.:

`mvn -Drelease install`

## Eclipse Continuous Integration Environment
The Eclipse continuous integration environment interface for the CDI project is located at https://ci.eclipse.org/cdi/
The https://github.com/jakartaee/cdi/wiki/Eclipse-CI-Release-Jobs page describes the jobs found there.

## Sources in GIT

Master branch contains the CDI TCK 4.0

### Source Layout

* dist-build - assembly project to create the distribution zip - TBD
* doc - the TCK user guide source - TBD
* src - The set of tests that depend on web and full platform containers
* README.md - this doc
Loading

0 comments on commit a38f4c9

Please sign in to comment.