Merge pull request #90 from OpenLiberty/qa

Merge qa to master: Add daily build to GH actions (#89)

Author: gkwan-ibm

.github/workflows/test.yml

@@ -1,40 +1,57 @@
-# This workflow will test the guide application.
-# For more information about building and testing Java,
-# see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
-
 name: Test application
 
 on:
   pull_request:
-    branches: [ qa ]
+    branches: [ master, qa ]
 
 jobs:
+  needTest:
+    runs-on: ubuntu-latest
+    outputs:
+        canSkip: ${{ steps.checkFiles.outputs.canSkip }}
+    steps:
+    - name: Check files in PR
+      id: checkFiles
+      run: |
+           PR_FILES_URL="https://api.github.com/repos/${GITHUB_REPOSITORY}/pulls/${{github.event.pull_request.number}}/files"
+           FILES_CHANGED=$(curl -s -X GET -G $PR_FILES_URL | jq -r '.[] | .filename')
+           echo $FILES_CHANGED
+           if [ ${#FILES_CHANGED[@]} == 1 ] && [ ${FILES_CHANGED[0]} == README.adoc ]; then
+             echo "Test can be skipped because only updated README.adoc"
+             echo "::set-output name=canSkip::true"
+           else
+             echo "Need to run test"           
+             echo "::set-output name=canSkip::false"
+           fi
+
   java8build:
     runs-on: ubuntu-latest
+    needs: [needTest]
+    if: "!contains(needs.needTest.outputs.canSkip, 'true')"
     defaults:
       run:
         working-directory: finish
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
-      with:
-        java-version: 1.8
-    - run: unset _JAVA_OPTIONS
-      
-    - name: Run tests
-      run: chmod +x ../scripts/travisTest.sh && sudo ../scripts/travisTest.sh
-      
-    - name: Post tests
-      if: always()
-      run: |
+      - uses: actions/checkout@v2
+      - name: Set up JDK 8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 8
+      - run: unset _JAVA_OPTIONS
+
+      - name: Run tests
+        run: sudo ../scripts/testApp.sh
+
+      - name: Post tests
+        if: always()
+        run: |
           logsPath=$(sudo find . -name "console.log");
           sudo cat $logsPath | sudo grep Launching
-          
-    - name: Archive server logs if failed
-      if: failure()
-      uses: actions/upload-artifact@v2
-      with:
-        name: server-logs
-        path: finish/target/liberty/wlp/usr/servers/defaultServer/logs/
+
+      - name: Archive server logs if failed
+        if: failure()
+        uses: actions/upload-artifact@v2
+        with:
+          name: server-logs
+          path: finish/target/liberty/wlp/usr/servers/defaultServer/logs/

.travis.yml

@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
@@ -47,7 +46,7 @@
             <plugin>
                 <groupId>io.openliberty.tools</groupId>
                 <artifactId>liberty-maven-plugin</artifactId>
-                <version>3.2</version>
+                <version>3.2.3</version>
             </plugin>
             <!-- tag::frontend-plugin[] -->
             <plugin>

finish/pom.xml

@@ -0,0 +1,14 @@
+#!/bin/bash
+while getopts t:d:b:u: flag; do
+    case "${flag}" in
+    t) DATE="${OPTARG}" ;;
+    d) DRIVER="${OPTARG}" ;;
+    b) BUILD="${OPTARG}" ;;
+    u) DOCKER_USERNAME="${OPTARG}" ;;
+    esac
+done
+
+sed -i "\#<artifactId>liberty-maven-plugin</artifactId>#a<configuration><install><runtimeUrl>https://public.dhe.ibm.com/ibmdl/export/pub/software/openliberty/runtime/nightly/"$DATE"/"$DRIVER"</runtimeUrl></install></configuration>" pom.xml
+cat pom.xml
+
+../scripts/testApp.sh

scripts/dailyBuild.sh

@@ -3,7 +3,7 @@ set -euxo pipefail
 
 ##############################################################################
 ##
-##  Travis CI test script
+##  GH action sCI test script
 ##
 ##############################################################################
 
@@ -25,6 +25,11 @@ mvn -q clean package liberty:create liberty:install-feature liberty:deploy
 #       failsafe:verify           - Verifies that the integration tests of an application passed.
 mvn liberty:start
 
-status="$(curl --write-out "%{http_code}\n" --silent --output /dev/null "http://localhost:9080/artists")"; if [ "$status" == "200" ]; then echo ENDPOINT OK; else echo "$status"; echo ENDPOINT NOT OK; exit 1; fi;
+status="$(curl --write-out "%{http_code}\n" --silent --output /dev/null "http://localhost:9080/artists")"
+if [ "$status" == "200" ]; then echo ENDPOINT OK; else
+    echo "$status"
+    echo ENDPOINT NOT OK
+    exit 1
+fi
 
 mvn liberty:stop

scripts/travisTest.sh scripts/testApp.shscripts/travisTest.sh renamed to scripts/testApp.sh

@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
@@ -47,7 +46,7 @@
             <plugin>
                 <groupId>io.openliberty.tools</groupId>
                 <artifactId>liberty-maven-plugin</artifactId>
-                <version>3.2</version>
+                <version>3.2.3</version>
             </plugin>
             <plugin>
                 <groupId>com.github.eirslett</groupId>