From: Michael Jeanson Date: Wed, 6 Jun 2018 18:32:58 +0000 (-0400) Subject: Move lttng-scope repos to Gitlab X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=b691be9d28948562bd38b12935deaf7083cccfa4;p=lttng-ci.git Move lttng-scope repos to Gitlab Signed-off-by: Michael Jeanson --- diff --git a/jobs/ctf-java.yml b/jobs/ctf-java.yml index 51ec16e..c5c3cf6 100644 --- a/jobs/ctf-java.yml +++ b/jobs/ctf-java.yml @@ -22,9 +22,9 @@ scm: - git: - url: git://github.com/{github_user}/{github_name}.git - browser: githubweb - browser-url: https://github.com/{github_user}/{github_name} + url: https://gitlab.com/{gitlab_user}/{gitlab_project}.git + browser: gitlab + browser-url: https://gitlab.com/{gitlab_user}/{gitlab_project} branches: - origin/{version} skip-tag: true @@ -37,8 +37,6 @@ properties: - build-discarder: num-to-keep: 2 - - github: - url: https://github.com/{github_user}/{github_name} - defaults: name: ctf-java @@ -56,9 +54,9 @@ scm: - git: - url: git://github.com/{github_user}/{github_name}.git - browser: githubweb - browser-url: https://github.com/{github_user}/{github_name} + url: https://gitlab.com/{gitlab_user}/{gitlab_project}.git + browser: gitlab + browser-url: https://gitlab.com/{gitlab_user}/{gitlab_project} branches: - origin/{version} skip-tag: true @@ -70,8 +68,6 @@ properties: - build-discarder: num-to-keep: 2 - - github: - url: https://github.com/{github_user}/{github_name} ## Templates @@ -163,9 +159,9 @@ scm: - git: - url: git://github.com/{github_user}/{github_name}.git - browser: githubweb - browser-url: https://github.com/{github_user}/{github_name} + url: https://gitlab.com/{gitlab_user}/{gitlab_project}.git + browser: gitlab + browser-url: https://gitlab.com/{gitlab_user}/{gitlab_project} branches: - origin/{version} skip-tag: true @@ -190,8 +186,8 @@ ## Project - project: name: ctf-java - github_user: efficios - github_name: ctf-java + gitlab_user: lttng + gitlab_project: lttng-scope/ctf-java email_to: 'ci-notification@lists.lttng.org, cc:alexmonthy@efficios.com' email_for_all_failure: 'alexmonthy@efficios.com' version: diff --git a/jobs/jabberwocky.yml b/jobs/jabberwocky.yml index af63eac..e1f703b 100644 --- a/jobs/jabberwocky.yml +++ b/jobs/jabberwocky.yml @@ -19,12 +19,21 @@ - workspace-cleanup - timestamps - ansicolor + - xvfb: + installation-name: "default" + auto-display-name: true + parallel-build: false + screen: 1024x768x24 + - timeout: + timeout: 60 + fail: true + type: absolute scm: - git: - url: git://github.com/{github_user}/{github_name}.git - browser: githubweb - browser-url: https://github.com/{github_user}/{github_name} + url: https://gitlab.com/{gitlab_user}/{gitlab_project}.git + browser: gitlab + browser-url: https://gitlab.com/{gitlab_user}/{gitlab_project} branches: - origin/{version} skip-tag: true @@ -37,8 +46,6 @@ properties: - build-discarder: num-to-keep: 2 - - github: - url: https://github.com/{github_user}/{github_name} - defaults: name: jabberwocky @@ -56,9 +63,9 @@ scm: - git: - url: git://github.com/{github_user}/{github_name}.git - browser: githubweb - browser-url: https://github.com/{github_user}/{github_name} + url: hhtps://gitlab.com/{gitlab_user}/{gitlab_project}.git + browser: gitlab + browser-url: https://gitlab.com/{gitlab_user}/{gitlab_project} branches: - origin/{version} skip-tag: true @@ -71,8 +78,6 @@ properties: - build-discarder: num-to-keep: 2 - - github: - url: https://github.com/{github_user}/{github_name} ## Templates @@ -163,9 +168,9 @@ scm: - git: - url: git://github.com/{github_user}/{github_name}.git - browser: githubweb - browser-url: https://github.com/{github_user}/{github_name} + url: https://gitlab.com/{gitlab_user}/{gitlab_project}.git + browser: gitlab + browser-url: https://gitlab.com/{gitlab_user}/{gitlab_project} branches: - origin/{version} skip-tag: true @@ -190,8 +195,8 @@ ## Project - project: name: jabberwocky - github_user: efficios - github_name: jabberwocky + gitlab_user: lttng + gitlab_project: lttng-scope/jabberwocky email_to: 'ci-notification@lists.lttng.org, cc:alexmonthy@efficios.com' email_for_all_failure: 'alexmonthy@efficios.com' version: diff --git a/jobs/libdelorean-java.yml b/jobs/libdelorean-java.yml index 44e4be8..ecc0b8b 100644 --- a/jobs/libdelorean-java.yml +++ b/jobs/libdelorean-java.yml @@ -22,9 +22,9 @@ scm: - git: - url: git://github.com/{github_user}/{github_name}.git - browser: githubweb - browser-url: https://github.com/{github_user}/{github_name} + url: https://gitlab.com/{gitlab_user}/{gitlab_project}.git + browser: gitlab + browser-url: https://gitlab.com/{gitlab_user}/{gitlab_project} branches: - origin/{version} skip-tag: true @@ -37,8 +37,6 @@ properties: - build-discarder: num-to-keep: 2 - - github: - url: https://github.com/{github_user}/{github_name} - defaults: name: libdelorean-java @@ -56,9 +54,9 @@ scm: - git: - url: git://github.com/{github_user}/{github_name}.git - browser: githubweb - browser-url: https://github.com/{github_user}/{github_name} + url: https://gitlab.com/{gitlab_user}/{gitlab_project}.git + browser: gitlab + browser-url: https://gitlab.com/{gitlab_user}/{gitlab_project} branches: - origin/{version} skip-tag: true @@ -71,8 +69,6 @@ properties: - build-discarder: num-to-keep: 2 - - github: - url: https://github.com/{github_user}/{github_name} ## Templates @@ -163,9 +159,9 @@ scm: - git: - url: git://github.com/{github_user}/{github_name}.git - browser: githubweb - browser-url: https://github.com/{github_user}/{github_name} + url: https://gitlab.com/{gitlab_user}/{gitlab_project}.git + browser: gitlab + browser-url: https://gitlab.com/{gitlab_user}/{gitlab_project} branches: - origin/{version} skip-tag: true @@ -190,8 +186,8 @@ ## Project - project: name: libdelorean-java - github_user: efficios - github_name: libdelorean-java + gitlab_user: lttng + gitlab_project: lttng-scope/libdelorean-java email_to: 'ci-notification@lists.lttng.org, cc:alexmonthy@efficios.com' email_for_all_failure: 'alexmonthy@efficios.com' version: diff --git a/jobs/lttng-scope.yml b/jobs/lttng-scope.yml index 7edfd50..6e51062 100644 --- a/jobs/lttng-scope.yml +++ b/jobs/lttng-scope.yml @@ -14,9 +14,9 @@ scm: - git: - url: git://github.com/{github_user}/{github_name}.git - browser: githubweb - browser-url: https://github.com/{github_user}/{github_name} + url: https://gitlab.com/{gitlab_user}/{gitlab_project}.git + browser: gitlab + browser-url: https://gitlab.com/{gitlab_user}/{gitlab_project} branches: - origin/{version} skip-tag: true @@ -29,8 +29,6 @@ properties: - build-discarder: num-to-keep: 7 - - github: - url: https://github.com/{github_user}/{github_name} ## Templates @@ -73,8 +71,6 @@ goals: clean install -Dmaven.test.skip=false private-repository: true settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig277b7a2d-b7a6-4ae4-a32d-18c02514e9e4' - properties: - - maven.test.failure.ignore=true publishers: - archive: @@ -157,9 +153,9 @@ scm: - git: - url: git://github.com/{github_user}/{github_name}.git - browser: githubweb - browser-url: https://github.com/{github_user}/{github_name} + url: https://gitlab.com/{gitlab_user}/{gitlab_project}.git + browser: gitlab + browser-url: https://gitlab.com/{gitlab_user}/{gitlab_project} branches: - origin/{version} skip-tag: true @@ -180,8 +176,6 @@ goals: clean install -Dmaven.test.skip=false private-repository: true settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig277b7a2d-b7a6-4ae4-a32d-18c02514e9e4' - properties: - - maven.test.failure.ignore=true publishers: - archive: @@ -284,8 +278,6 @@ goals: clean install -Dmaven.test.skip=false private-repository: true settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig277b7a2d-b7a6-4ae4-a32d-18c02514e9e4' - properties: - - maven.test.failure.ignore=true publishers: - archive: @@ -376,9 +368,9 @@ scm: - git: - url: git://github.com/{github_user}/{github_name}.git - browser: githubweb - browser-url: https://github.com/{github_user}/{github_name} + url: https://gitlab.com/{gitlab_user}/{gitlab_project}.git + browser: gitlab + browser-url: https://gitlab.com/{gitlab_user}/{gitlab_project} branches: - origin/{version} skip-tag: true @@ -403,8 +395,8 @@ ## Project - project: name: lttng-scope - github_user: lttng - github_name: lttng-scope + gitlab_user: lttng + gitlab_project: lttng-scope/lttng-scope email_to: 'ci-notification@lists.lttng.org, cc:alexmonthy@efficios.com' email_for_all_failure: 'alexmonthy@efficios.com' version: