Merge pull request #157 from mezarin/enableRegressionTests

Re-enable regression tests.
OpenLiberty · Aug 3, 2021 · 81b3051 · 81b3051
2 parents 26f2f16 + 412482e
commit 81b3051
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/stack-regression-tests.yml b/.github/workflows/stack-regression-tests.yml
@@ -54,11 +54,11 @@ jobs:
  - name: 'Test: InnerLoop: Gradle: Basic'
  run: ./test/inner-loop/basic-test.sh gradle
 
- # TODO: Needs pre-existing stack with gradle. Update/Re-enable once code is merged.
- #- name: 'Test: InnerLoop: Maven: Devfile regression'
- # run: ./test/inner-loop/devfile-regression-test.sh
- #- name: 'Test: InnerLoop: Gradle: Devfile regression'
- # run: ./test/inner-loop/devfile-regression-test.sh gradle
+ - name: 'Test: InnerLoop: Maven: Devfile regression'
+  run: ./test/inner-loop/devfile-regression-test.sh
+
+ - name: 'Test: InnerLoop: Gradle: Devfile regression'
+ run: ./test/inner-loop/devfile-regression-test.sh gradle
 
  - name: 'Test: InnerLoop: Maven: microprofile v3 regression'
  run: ./test/inner-loop/mp3-regression-test.sh

diff --git a/build.sh b/build.sh
@@ -23,8 +23,8 @@ OL_UBI_IMAGE="${OL_UBI_IMAGE:-openliberty/open-liberty:21.0.0.6-full-java11-open
 #
 # The name and tag of the stack image you will build. This will used to create your inner loop development containers, and also as the base image for the first stage of your outer loop image build.
 #
-STACK_IMAGE_MAVEN="${STACK_IMAGE_MAVEN:-openliberty/application-stack:0.6.0}"
-STACK_IMAGE_GRADLE="${STACK_IMAGE_GRADLE:-openliberty/application-stack:gradle-0.1.0}"
+STACK_IMAGE_MAVEN="${STACK_IMAGE_MAVEN:-openliberty/application-stack:0.6}"
+STACK_IMAGE_GRADLE="${STACK_IMAGE_GRADLE:-openliberty/application-stack:gradle-0.1}"
 
 #
 # URL at which your outer loop Dockerfile is hosted