You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2020/09/15 08:51:03 UTC
[isis] branch master updated: ISIS-2428: update build infra. and
adoc after moving smoketests
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 1f2f539 ISIS-2428: update build infra. and adoc after moving smoketests
1f2f539 is described below
commit 1f2f539d8d175ef1a1cde98f4064c0def196a514
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Sep 15 10:50:46 2020 +0200
ISIS-2428: update build infra. and adoc after moving smoketests
---
.github/workflows/ci-build-core-no-push-gradle.yml | 4 ++--
.github/workflows/ci-build-core-no-push-maven.yml | 4 ++--
.../docs/modules/ROOT/pages/landing-page/internal.adoc | 4 ++--
antora/playbooks/site-core.yml | 2 +-
antora/playbooks/site.yml | 2 +-
build-smoketests.sh | 2 +-
isis-parent/pom.xml | 6 +++---
pom.xml | 2 +-
.../adoc/modules/{smoketests => regressiontests}/nav.adoc | 0
.../{smoketests => regressiontests}/pages/about.adoc | 2 +-
.../adoc/modules/regressiontests/partials/module-nav.adoc | 6 ++++++
.../adoc/modules/smoketests/partials/module-nav.adoc | 6 ------
regressiontests/incubating/pom.xml | 14 +++++++-------
regressiontests/stable/build.gradle | 4 ++--
regressiontests/stable/pom.xml | 8 ++++----
settings.gradle | 4 ++--
16 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/ci-build-core-no-push-gradle.yml b/.github/workflows/ci-build-core-no-push-gradle.yml
index 710b067..dc87bdb 100644
--- a/.github/workflows/ci-build-core-no-push-gradle.yml
+++ b/.github/workflows/ci-build-core-no-push-gradle.yml
@@ -54,8 +54,8 @@ jobs:
shell: bash
run: bash $CI_SCRIPTS_PATH/build-core-using-gradle.sh
# env:
-# # also build and run smoketests and kroviz
-# MVN_ADDITIONAL_OPTS: -Dsmoketests-module -Dkroviz-module
+# # also build and run regressiontests and kroviz
+# MVN_ADDITIONAL_OPTS: -Dregressiontests-module -Dkroviz-module
# FOR DEBUG USE
# - name: Dump GitHub context
diff --git a/.github/workflows/ci-build-core-no-push-maven.yml b/.github/workflows/ci-build-core-no-push-maven.yml
index 119cdda..ac8e9e7 100644
--- a/.github/workflows/ci-build-core-no-push-maven.yml
+++ b/.github/workflows/ci-build-core-no-push-maven.yml
@@ -53,8 +53,8 @@ jobs:
shell: bash
run: bash $CI_SCRIPTS_PATH/build-core.sh
env:
- # also build and run smoketests and kroviz
- MVN_ADDITIONAL_OPTS: -Dsmoketests-module -Dkroviz-module
+ # also build and run regressiontests and kroviz
+ MVN_ADDITIONAL_OPTS: -Dregressiontests-module -Dkroviz-module
# FOR DEBUG USE
# - name: Dump GitHub context
diff --git a/antora/components/docs/modules/ROOT/pages/landing-page/internal.adoc b/antora/components/docs/modules/ROOT/pages/landing-page/internal.adoc
index 28f5dcf..ed5df08 100644
--- a/antora/components/docs/modules/ROOT/pages/landing-page/internal.adoc
+++ b/antora/components/docs/modules/ROOT/pages/landing-page/internal.adoc
@@ -8,12 +8,12 @@ They include guides for day-to-day operations, as well as notes on the design/im
== Contributors & Committers
-** xref:conguide:ROOT:about.adoc[Contributors' Guide]
+* xref:conguide:ROOT:about.adoc[Contributors' Guide]
* xref:comguide:ROOT:about.adoc[Committers' Guide]
== Design & Implementation
* xref:core:ROOT:about.adoc[Design Docs]
-* xref:smoketests:ROOT:about.adoc[SmokeTest App]
+* xref:regressiontests:ROOT:about.adoc[Regression Tests]
diff --git a/antora/playbooks/site-core.yml b/antora/playbooks/site-core.yml
index 356a8d2..4bde93e 100644
--- a/antora/playbooks/site-core.yml
+++ b/antora/playbooks/site-core.yml
@@ -58,7 +58,7 @@ content:
start_path: examples/demo/domain/src/main/adoc # docs
branches: HEAD
- url: .
- start_path: examples/smoketests/adoc # core
+ start_path: regressiontests/adoc # core
branches: HEAD
# mavendeps
diff --git a/antora/playbooks/site.yml b/antora/playbooks/site.yml
index 0721fe0..9e56fcd 100644
--- a/antora/playbooks/site.yml
+++ b/antora/playbooks/site.yml
@@ -94,7 +94,7 @@ content:
start_path: examples/demo/domain/src/main/adoc # docs
branches: HEAD
- url: .
- start_path: examples/smoketests/adoc # core
+ start_path: regressiontests/adoc # core
branches: HEAD
# extensions
diff --git a/build-smoketests.sh b/build-smoketests.sh
index ec85572..199a90d 100644
--- a/build-smoketests.sh
+++ b/build-smoketests.sh
@@ -1,3 +1,3 @@
#!/bin/bash
export BATCH_MODE_FLAG=off
-sh scripts/ci/build-smoketests.sh $*
\ No newline at end of file
+sh scripts/ci/build-regressiontests.sh $*
\ No newline at end of file
diff --git a/isis-parent/pom.xml b/isis-parent/pom.xml
index 9826550..4a50d16 100644
--- a/isis-parent/pom.xml
+++ b/isis-parent/pom.xml
@@ -959,14 +959,14 @@ under the License.
</profile>
<profile>
- <id>smoketests-module</id>
+ <id>regressiontests-module</id>
<activation>
<property>
- <name>smoketests-module</name>
+ <name>regressiontests-module</name>
</property>
</activation>
<modules>
- <module>../examples/smoketests</module>
+ <module>../regressiontests</module>
</modules>
</profile>
diff --git a/pom.xml b/pom.xml
index 17354d4..b75e9c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@
<module>isis-parent</module>
<module>examples/demo</module>
- <module>examples/smoketests</module>
+ <module>regressiontests</module>
</modules>
</project>
diff --git a/regressiontests/adoc/modules/smoketests/nav.adoc b/regressiontests/adoc/modules/regressiontests/nav.adoc
similarity index 100%
rename from regressiontests/adoc/modules/smoketests/nav.adoc
rename to regressiontests/adoc/modules/regressiontests/nav.adoc
diff --git a/regressiontests/adoc/modules/smoketests/pages/about.adoc b/regressiontests/adoc/modules/regressiontests/pages/about.adoc
similarity index 97%
rename from regressiontests/adoc/modules/smoketests/pages/about.adoc
rename to regressiontests/adoc/modules/regressiontests/pages/about.adoc
index 47686c0..b161eeb 100644
--- a/regressiontests/adoc/modules/smoketests/pages/about.adoc
+++ b/regressiontests/adoc/modules/regressiontests/pages/about.adoc
@@ -1,4 +1,4 @@
-= SmokeTests
+= Regression Tests
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
diff --git a/regressiontests/adoc/modules/regressiontests/partials/module-nav.adoc b/regressiontests/adoc/modules/regressiontests/partials/module-nav.adoc
new file mode 100644
index 0000000..38a90ab
--- /dev/null
+++ b/regressiontests/adoc/modules/regressiontests/partials/module-nav.adoc
@@ -0,0 +1,6 @@
+
+
+
+* xref:regressiontests:about.adoc[Regression Rests]
+
+
diff --git a/regressiontests/adoc/modules/smoketests/partials/module-nav.adoc b/regressiontests/adoc/modules/smoketests/partials/module-nav.adoc
deleted file mode 100644
index ed99b6d..0000000
--- a/regressiontests/adoc/modules/smoketests/partials/module-nav.adoc
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-* xref:core:smoketests:about.adoc[SmokeTest app]
-
-
diff --git a/regressiontests/incubating/pom.xml b/regressiontests/incubating/pom.xml
index 18aa997..fee22ac 100644
--- a/regressiontests/incubating/pom.xml
+++ b/regressiontests/incubating/pom.xml
@@ -15,21 +15,21 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis.app</groupId>
- <artifactId>smoketests</artifactId>
+ <groupId>org.apache.isis.regressiontests</groupId>
+ <artifactId>isis-regressiontests</artifactId>
<version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>smoketests-incubating</artifactId>
+ <artifactId>isis-regressiontests-incubating</artifactId>
- <name>Apache Isis App - Smoketests (incubating)</name>
+ <name>Apache Isis - Regression Tests (incubating)</name>
<dependencies>
- <!-- smoketests-stable has the domain to test against -->
+ <!-- isis-regressiontests-stable has the domain to test against -->
<dependency>
- <groupId>org.apache.isis.app</groupId>
- <artifactId>smoketests-stable</artifactId>
+ <groupId>org.apache.isis.regressiontests</groupId>
+ <artifactId>isis-regressiontests-stable</artifactId>
<version>2.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/regressiontests/stable/build.gradle b/regressiontests/stable/build.gradle
index 8e00919..c833b32 100644
--- a/regressiontests/stable/build.gradle
+++ b/regressiontests/stable/build.gradle
@@ -3,8 +3,8 @@ plugins {
id "org.rm3l.datanucleus-gradle-plugin" version "1.5.0"
}
-group = 'org.apache.isis.app'
-description = 'Apache Isis App - Smoketests'
+group = 'org.apache.isis.regressiontests'
+description = 'Apache Isis - Regression Tests'
compileJava {
options.compilerArgs << '-parameters'
diff --git a/regressiontests/stable/pom.xml b/regressiontests/stable/pom.xml
index d736fbc..46542c5 100644
--- a/regressiontests/stable/pom.xml
+++ b/regressiontests/stable/pom.xml
@@ -15,15 +15,15 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis.app</groupId>
- <artifactId>smoketests</artifactId>
+ <groupId>org.apache.isis.regressiontests</groupId>
+ <artifactId>isis-regressiontests</artifactId>
<version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>smoketests-stable</artifactId>
+ <artifactId>isis-regressiontests-stable</artifactId>
- <name>Apache Isis App - Smoketests (stable)</name>
+ <name>Apache Isis - Regression Tests (stable)</name>
<dependencies>
<dependency>
diff --git a/settings.gradle b/settings.gradle
index 03bb747..f739a19 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -130,7 +130,7 @@ include ':isis-parent:isis:isis-valuetypes:isis-valuetypes-sse:isis-valuetypes-s
include ':isis-parent:isis:isis-valuetypes:isis-valuetypes-sse'
include ':isis-parent:isis:isis-valuetypes'
include ':isis-app-starter-parent:demo-parent'
-include ':isis-app-starter-parent:smoketests'
+include ':isis-app-starter-parent:regressiontests'
project(':isis-parent:isis-schema').projectDir = "$rootDir/api/schema" as File
project(':isis-parent:isis-applib').projectDir = "$rootDir/api/applib" as File
@@ -264,4 +264,4 @@ project(':isis-parent:isis:isis-valuetypes:isis-valuetypes-sse').projectDir = "$
project(':isis-parent:isis:isis-valuetypes').projectDir = "$rootDir/valuetypes" as File
project(':isis-app-starter-parent').projectDir = "$rootDir/starters" as File
project(':isis-app-starter-parent:demo-parent').projectDir = "$rootDir/examples/demo" as File
-project(':isis-app-starter-parent:smoketests').projectDir = "$rootDir/examples/smoketests/stable" as File
+project(':isis-app-starter-parent:regressiontests').projectDir = "$rootDir/regressiontests/stable" as File