From 08389925b99e08ad18fd795894aaf4b6e4de7993 Mon Sep 17 00:00:00 2001 From: jansupol Date: Wed, 27 Oct 2021 15:05:58 +0200 Subject: [PATCH 1/2] Fix timeout in Jenkins pipeline Signed-off-by: jansupol --- etc/jenkins/Jenkinsfile_ci_build | 86 ++++++++++++++++---------------- 1 file changed, 44 insertions(+), 42 deletions(-) diff --git a/etc/jenkins/Jenkinsfile_ci_build b/etc/jenkins/Jenkinsfile_ci_build index 38b509d2..2ac02633 100644 --- a/etc/jenkins/Jenkinsfile_ci_build +++ b/etc/jenkins/Jenkinsfile_ci_build @@ -1,53 +1,55 @@ pipeline { agent none + + options { + timeout(time: 1, unit: 'HOURS') // timeout on whole pipeline job + } stages { stage('Jersey build') { - timeout(unit: 'MINUTES', time: 120) { - parallel { - stage('JDK 8 ') { - agent { - label 'centos-7' - } - tools { - jdk 'oracle-jdk8-latest' - maven 'apache-maven-latest' - } - steps { - sh ''' - mvn -U -C -Dtyrus.test.container.client=org.glassfish.tyrus.container.grizzly.client.GrizzlyClientContainer -Pbundles clean install -Dmaven.javadoc.skip=true - ''' - } + parallel { + stage('JDK 8 ') { + agent { + label 'centos-7' } - stage('JDK 13 ') { - agent { - label 'centos-7' - } - tools { - jdk 'openjdk-jdk13-latest' - maven 'apache-maven-latest' - } - steps { - sh ''' - mvn -U -C -Dtyrus.test.container.client=org.glassfish.tyrus.container.grizzly.client.GrizzlyClientContainer -Pbundles clean install -Dmaven.javadoc.skip=true - ''' - } + tools { + jdk 'oracle-jdk8-latest' + maven 'apache-maven-latest' + } + steps { + sh ''' + mvn -U -C -Dtyrus.test.container.client=org.glassfish.tyrus.container.grizzly.client.GrizzlyClientContainer -Pbundles clean install -Dmaven.javadoc.skip=true + ''' + } + } + stage('JDK 13 ') { + agent { + label 'centos-7' + } + tools { + jdk 'openjdk-jdk13-latest' + maven 'apache-maven-latest' + } + steps { + sh ''' + mvn -U -C -Dtyrus.test.container.client=org.glassfish.tyrus.container.grizzly.client.GrizzlyClientContainer -Pbundles clean install -Dmaven.javadoc.skip=true + ''' } - //stage('JDK 17 ') { - // agent { - // label 'centos-7' - // } - // tools { - // jdk 'openjdk-jdk17-latest' - // maven 'apache-maven-latest' - // } - // steps { - // sh ''' - // mvn -U -C -Dtyrus.test.container.client=org.glassfish.tyrus.container.grizzly.client.GrizzlyClientContainer -Pbundles clean install -Dmaven.javadoc.skip=true - // ''' - // } - //} } + //stage('JDK 17 ') { + // agent { + // label 'centos-7' + // } + // tools { + // jdk 'openjdk-jdk17-latest' + // maven 'apache-maven-latest' + // } + // steps { + // sh ''' + // mvn -U -C -Dtyrus.test.container.client=org.glassfish.tyrus.container.grizzly.client.GrizzlyClientContainer -Pbundles clean install -Dmaven.javadoc.skip=true + // ''' + // } + //} } } } From 3b1220d7641acdb8080cfde96ddfc08a71a9d5b4 Mon Sep 17 00:00:00 2001 From: jansupol Date: Wed, 27 Oct 2021 17:04:25 +0200 Subject: [PATCH 2/2] Disable tests in Github actions temporarily Signed-off-by: jansupol --- .github/workflows/maven.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 095abc37..126d4929 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -23,7 +23,7 @@ jobs: strategy: matrix: - java_version: [ 11, 17-ea ] + java_version: [ 11 ] continue-on-error: false steps: @@ -37,4 +37,4 @@ jobs: distribution: 'zulu' java-version: ${{ matrix.java_version }} - name: Build - run: mvn -U -C -Dtyrus.test.container.client=org.glassfish.tyrus.container.grizzly.client.GrizzlyClientContainer -Pbundles clean install -Dmaven.javadoc.skip=true + run: mvn -U -C -Dtyrus.test.container.client=org.glassfish.tyrus.container.grizzly.client.GrizzlyClientContainer -Pbundles clean install -Dmaven.javadoc.skip=true -DskipTests