From c0cf2437fd8879a078c218ca49661dc8fafd212f Mon Sep 17 00:00:00 2001 From: Tomas Della Vedova Date: Fri, 25 Oct 2019 10:55:45 +0200 Subject: [PATCH] Move back to jjbb (#995) * Removed Jenkins pipelines configuration * Restored jjbb definitions --- .ci/jobs/elastic+elasticsearch-js+5.x.yml | 14 +++++ .ci/jobs/elastic+elasticsearch-js+6.x.yml | 14 +++++ .ci/jobs/elastic+elasticsearch-js+7.x.yml | 14 +++++ .ci/jobs/elastic+elasticsearch-js+master.yml | 14 +++++ .ci/jobs/elastic+elasticsearch-js+mbp.yml | 55 ------------------- .../elastic+elasticsearch-js+pull-request.yml | 19 +++++++ 6 files changed, 75 insertions(+), 55 deletions(-) create mode 100644 .ci/jobs/elastic+elasticsearch-js+5.x.yml create mode 100644 .ci/jobs/elastic+elasticsearch-js+6.x.yml create mode 100644 .ci/jobs/elastic+elasticsearch-js+7.x.yml create mode 100644 .ci/jobs/elastic+elasticsearch-js+master.yml delete mode 100644 .ci/jobs/elastic+elasticsearch-js+mbp.yml create mode 100644 .ci/jobs/elastic+elasticsearch-js+pull-request.yml diff --git a/.ci/jobs/elastic+elasticsearch-js+5.x.yml b/.ci/jobs/elastic+elasticsearch-js+5.x.yml new file mode 100644 index 000000000..0b422ae31 --- /dev/null +++ b/.ci/jobs/elastic+elasticsearch-js+5.x.yml @@ -0,0 +1,14 @@ +--- +- job: + name: elastic+elasticsearch-js+5.x + display-name: 'elastic / elasticsearch-js # 5.x' + description: Testing the elasticsearch-js 5.x branch. + parameters: + - string: + name: branch_specifier + default: refs/heads/5.x + description: the Git branch specifier to build (<branchName>, <tagName>, + <commitId>, etc.) + triggers: + - github + - timed: '@weekly' diff --git a/.ci/jobs/elastic+elasticsearch-js+6.x.yml b/.ci/jobs/elastic+elasticsearch-js+6.x.yml new file mode 100644 index 000000000..8f9a02c67 --- /dev/null +++ b/.ci/jobs/elastic+elasticsearch-js+6.x.yml @@ -0,0 +1,14 @@ +--- +- job: + name: elastic+elasticsearch-js+6.x + display-name: 'elastic / elasticsearch-js # 6.x' + description: Testing the elasticsearch-js 6.x branch. + parameters: + - string: + name: branch_specifier + default: refs/heads/6.x + description: the Git branch specifier to build (<branchName>, <tagName>, + <commitId>, etc.) + triggers: + - github + - timed: '@weekly' diff --git a/.ci/jobs/elastic+elasticsearch-js+7.x.yml b/.ci/jobs/elastic+elasticsearch-js+7.x.yml new file mode 100644 index 000000000..a25c2b5ae --- /dev/null +++ b/.ci/jobs/elastic+elasticsearch-js+7.x.yml @@ -0,0 +1,14 @@ +--- +- job: + name: elastic+elasticsearch-js+7.x + display-name: 'elastic / elasticsearch-js # 7.x' + description: Testing the elasticsearch-js 7.x branch. + parameters: + - string: + name: branch_specifier + default: refs/heads/7.x + description: the Git branch specifier to build (<branchName>, <tagName>, + <commitId>, etc.) + triggers: + - github + - timed: '@weekly' diff --git a/.ci/jobs/elastic+elasticsearch-js+master.yml b/.ci/jobs/elastic+elasticsearch-js+master.yml new file mode 100644 index 000000000..284d30f55 --- /dev/null +++ b/.ci/jobs/elastic+elasticsearch-js+master.yml @@ -0,0 +1,14 @@ +--- +- job: + name: elastic+elasticsearch-js+master + display-name: 'elastic / elasticsearch-js # master' + description: Testing the elasticsearch-js master branch. + parameters: + - string: + name: branch_specifier + default: refs/heads/master + description: the Git branch specifier to build (<branchName>, <tagName>, + <commitId>, etc.) + triggers: + - github + - timed: '@daily' diff --git a/.ci/jobs/elastic+elasticsearch-js+mbp.yml b/.ci/jobs/elastic+elasticsearch-js+mbp.yml deleted file mode 100644 index 2cfc699b4..000000000 --- a/.ci/jobs/elastic+elasticsearch-js+mbp.yml +++ /dev/null @@ -1,55 +0,0 @@ ---- -- job: - name: elastic+elasticsearch-js+mbp - display-name: 'elastic / elasticsearch-js' - description: Testing elasticsearch-js. - project-type: multibranch - properties: [] - triggers: [] - logrotate: - daysToKeep: 30 - number-to-keep: '5' - days-to-keep: '1' - concurrent: true - node: linux - script-path: .ci/Jenkinsfile - scm: - - github: - branch-discovery: no-pr - discover-pr-forks-strategy: merge-current - discover-pr-forks-trust: permission - discover-pr-origin: merge-current - discover-tags: false - repo: elasticsearch-js - repo-owner: elastic - credentials-id: 2a9602aa-ab9f-4e52-baf3-b71ca88469c7-UserAndToken - ssh-checkout: - credentials: f6c7695a-671e-4f4f-a331-acdce44ff9ba - build-strategies: - - tags: - ignore-tags-older-than: -1 - ignore-tags-newer-than: -1 - - regular-branches: true - - change-request: - ignore-target-only-changes: false - clean: - after: true - before: true - prune: true - shallow-clone: true - depth: 3 - do-not-fetch-tags: true - submodule: - disable: false - recursive: true - parent-credentials: true - timeout: 100 - timeout: '15' - use-author: true - wipe-workspace: 'True' - periodic-folder-trigger: 1d - prune-dead-branches: true - publishers: - - email: - recipients: infra-root+build@elastic.co - diff --git a/.ci/jobs/elastic+elasticsearch-js+pull-request.yml b/.ci/jobs/elastic+elasticsearch-js+pull-request.yml new file mode 100644 index 000000000..78cde9ecc --- /dev/null +++ b/.ci/jobs/elastic+elasticsearch-js+pull-request.yml @@ -0,0 +1,19 @@ +--- +- job: + name: elastic+elasticsearch-js+pull-request + display-name: 'elastic / elasticsearch-js # pull-request' + description: Testing of elasticsearch-js pull requests. + scm: + - git: + branches: + - ${ghprbActualCommit} + refspec: +refs/pull/*:refs/remotes/origin/pr/* + triggers: + - github-pull-request: + org-list: + - elastic + allow-whitelist-orgs-as-admins: true + github-hooks: true + status-context: clients-ci + cancel-builds-on-update: true + publishers: []