Move periodic job to ES repo #48570

alpar-t · 2019-10-28T10:01:10Z

Add the first job definition to the ES repo.
The goal is to move them all, this one paves the way.

Relates to https://github.com/elastic/infra/issues/15187

This change kickstarts the process of moving CI job definitions to this repo.

elasticmachine · 2019-10-28T10:01:12Z

Pinging @elastic/es-core-infra (:Core/Infra/Build)

rjernst

This looks fine, but could you please add a README to .ci or .ci/jobs.t explaining the format of the yml files? I believe they are jjb, but to someone unfamiliar with the CI setup that would not be obvious.

rjernst · 2019-10-28T18:13:36Z

.ci/make-branch-config.sh

@@ -0,0 +1,11 @@
+#!/bin/bash 


Perhaps we should have a .ci/scripts directory? Seems we are accumulating a lot of different shell scripts all at the root.

That's a good idea. I'll move that in the next iteration, when I have to re-test this anyhow.

alpar-t · 2019-10-29T05:51:35Z

This looks fine, but could you please add a README to .ci or .ci/jobs.t explaining the format of the yml files? I believe they are jjb, but to someone unfamiliar with the CI setup that would not be obvious.

I definitely want to add some documentation for this ... It's JJBN the tool that wraps JJB but I think I'll just like to the lather, as the syntax is very similar and the former link is not public.

.ci/README.md

pugnascotia · 2019-10-29T10:20:09Z

.ci/jobs.t/defaults.yml

+          reference-repo: "/var/lib/jenkins/.git-references/elasticsearch.git"
+          branches:
+            - "%BRANCH%"
+          url: "https://github.com/atorok/elasticsearch.git"


Should this be the main repo?

good catch!

Co-Authored-By: Rory Hunter <pugnascotia@users.noreply.github.com>

…onvert-jjbb

mark-vieira · 2019-10-29T20:34:24Z

.ci/README.md

+Jobs live in the [jobs.t](jobs.t) directory, these are defined in YML using a syntax 
+simmilar to [JJB](https://elasticsearch-ci.elastic.co/view/Elasticsearch%20master/).
+Macros are not allowed, and each job must be defined in its own file.
+Merging of the default configuration is customized so unlike in standard JJB,


Merging of the default configuration is customized so unlike in standard JJB, it recurses into YML objects.

This makes me so happy. The behavior in JJB was infuriating.

mark-vieira

Left some comments. I'm still a little tentative about this one. Seems like there are some significant tradeoffs with JJBB. Let's see if it's worthwhile in the end.

Also how does this work in practice? Will Jenkins automatically pick up this job as soon as this is merged? Do we have to somehow tell Jenkins to look for job definitions here? How does this work for pull requests? How do we whitelist/blacklist branches?

mark-vieira · 2019-10-29T20:35:52Z

.ci/README.md

+
+CI is run by Jenkins at [elasticsearch-ci](https://elasticsearch-ci.elastic.co/).
+Jobs live in the [jobs.t](jobs.t) directory, these are defined in YML using a syntax 
+simmilar to [JJB](https://elasticsearch-ci.elastic.co/view/Elasticsearch%20master/).


What are the differences vs "vanilla" JJB? Is there some documentation in the infra repo we can link to here?

There is but I didn't want to include it because it's not public.

Would that be so bad? External folks would just get denied.

.ci/jobs.t/defaults.yml

.ci/jobs.t/elastic+elasticsearch+{branch}+periodic-next.yml

mark-vieira · 2019-10-29T20:41:27Z

.ci/jobs.t/defaults.yml

+            JAVA12_HOME=$HOME/.java/openjdk12
+            JAVA13_HOME=$HOME/.java/openjdk13
+       - shell: |
+          #!/usr/local/bin/runbld --redirect-stderr {runbld_args}


Does JJB support parameterization? What does {runbld_args} evaluate to here? I suspect this is just copy/paste leftovers from the original builder macro.

you are correct, I changed it to default to last good commit.
We could also drop the shell part to have no default, maybe that would be less confusing

👍 I think if the expectation is that the shell bit is always overridden then having a default might not make sense.

mark-vieira · 2019-10-29T20:42:22Z

.ci/jobs.t/defaults.yml

+          fail: true
+      - ansicolor
+      - timestamps
+      # TODO: No support un JJBB ?


We had to use a custom JJB module for this one. I'm not sure how that translate to JJBB. We need to sort this out though as this is how we gather published build scans from Jenkins. Without this HOMER won't be able to find build scans either so this is a show stopper IMO unless we can sort it out.

I was planing on sorting this out before I remove the job from the .ci repo.
Right now it's ok to be missing the notifications because this will be an additional job, the purpose is to make sure all the mechanics of creating and updating the jobs work.

alpar-t · 2019-10-30T07:17:41Z

@mark-vieira see https://github.com/elastic/infra/pull/15687 as a starting point on how this works. TL;DR is that there are jobs on the infra side that trigger when the configuration changes and these get deployed automatically.
PR jobs will be defined on one branch only, but maybe we can find a way to tell Jenkins to pick jobs based on the target branch. The jobs are not loaded / tested as part of PRs.
The list of active branches lives on the infra side just as before.

For me these are the clear advantages:

we can have per branch job configuration that lives with the build. there are some changes that we can't easily roll out without this, like running the packaging tests on nested virtualization, because 6.8 doesn't have the build changes to support it.
one job per file makes for a nicer overview and lack of macros makes the configuration easier to understand.
we don't have to create PRs in multiple branches when changing build and CI, and don't have to wait for someone to merge CI related changes
should we move to some other CI, the lack of macros and one job per file should make it easier than what we have with JJB so the work here isn't completely lost.

alpar-t · 2019-10-30T08:52:38Z

@elasticmachine update branch

alpar-t · 2019-10-30T15:31:41Z

@elasticmachine run elasticsearch-ci/2 and run elasticsearch-ci/1

mark-vieira · 2019-10-30T18:26:53Z

we don't have to create PRs in multiple branches when changing build and CI, and don't have to wait for someone to merge CI related changes

How is this synchronized? I suspect there's no coordination between the JJBB job that updates the job definitions and the commit jobs. So we still might need to be careful here, or just live with the fact that we'll get some initial failures because we pushed a build config change that depends on a job config change that hasn't yet been deployed.

mark-vieira · 2019-10-30T18:27:21Z

should we move to some other CI, the lack of macros and one job per file should make it easier than what we have with JJB so the work here isn't completely lost.

Or we could move to another CI system that doesn't have this same limitation 😉

alpar-t · 2019-10-31T10:15:00Z

@mark-vieira are you saying we should drop this for now ? Keep the jobs in the infra repo until we have smth better ?

mark-vieira · 2019-10-31T17:46:13Z

@mark-vieira are you saying we should drop this for now ? Keep the jobs in the infra repo until we have smth better ?

No, definitely not. I think there are clear benefits here that more than likely outweigh the limitations. My above comment was mostly jest. I'm hoping eventually we find a solution w/o such limitation but for now let's push forward.

alpar-t · 2019-11-11T09:32:25Z

@elasticmachine update branch

* Move periodic job to ES repo This change kickstarts the process of moving CI job definitions to this repo. * Added a minimal readme to provide pointers to the documentation * Update .ci/README.md Co-Authored-By: Rory Hunter <pugnascotia@users.noreply.github.com> * Update .ci/README.md Co-Authored-By: Rory Hunter <pugnascotia@users.noreply.github.com> * point to main repo * PR review * Add link to JJBB

Move periodic job to ES repo

3fe2504

This change kickstarts the process of moving CI job definitions to this repo.

alpar-t added :Delivery/Build Build or test infrastructure v8.0.0 v7.5.0 v7.6.0 v7.4.2 v6.8.5 labels Oct 28, 2019

rjernst reviewed Oct 28, 2019

View reviewed changes

Added a minimal readme to provide pointers to the documentation

4d0b7eb

pugnascotia reviewed Oct 29, 2019

View reviewed changes

.ci/README.md Outdated Show resolved Hide resolved

pugnascotia reviewed Oct 29, 2019

View reviewed changes

.ci/README.md Outdated Show resolved Hide resolved

pugnascotia reviewed Oct 29, 2019

View reviewed changes

alpar-t and others added 4 commits October 29, 2019 14:31

Update .ci/README.md

86049af

Co-Authored-By: Rory Hunter <pugnascotia@users.noreply.github.com>

Update .ci/README.md

811b707

Co-Authored-By: Rory Hunter <pugnascotia@users.noreply.github.com>

point to main repo

cc042d1

Merge branch 'convert-jjbb' of github.com:atorok/elasticsearch into c…

117cbd6

…onvert-jjbb

mark-vieira reviewed Oct 29, 2019

View reviewed changes

PR review

b6342cc

Merge branch 'master' into convert-jjbb

f925c5b

$@polyfractal$ polyfractal added v7.4.3 and removed v7.4.2 labels Oct 31, 2019

Add link to JJBB

2d52f58

Merge branch 'master' into convert-jjbb

0da414f

jimczi removed the v7.5.0 label Nov 12, 2019

alpar-t merged commit 91b0ac3 into elastic:master Nov 13, 2019

alpar-t deleted the convert-jjbb branch November 13, 2019 15:12

mark-vieira added the Team:Delivery Meta label for Delivery team label Nov 11, 2020

jakelandis added v8.0.0-alpha1 and removed v8.0.0 labels Jul 26, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Move periodic job to ES repo #48570

Move periodic job to ES repo #48570

alpar-t commented Oct 28, 2019 •

edited by mark-vieira

Loading

elasticmachine commented Oct 28, 2019

rjernst left a comment

rjernst Oct 28, 2019

alpar-t Oct 29, 2019

alpar-t commented Oct 29, 2019

pugnascotia Oct 29, 2019

alpar-t Oct 29, 2019

mark-vieira Oct 29, 2019

mark-vieira left a comment

mark-vieira Oct 29, 2019

alpar-t Oct 30, 2019

mark-vieira Oct 30, 2019

mark-vieira Oct 29, 2019

alpar-t Oct 30, 2019

mark-vieira Oct 30, 2019

mark-vieira Oct 29, 2019

alpar-t Oct 30, 2019

alpar-t commented Oct 30, 2019

alpar-t commented Oct 30, 2019

alpar-t commented Oct 30, 2019

mark-vieira commented Oct 30, 2019

mark-vieira commented Oct 30, 2019

alpar-t commented Oct 31, 2019

mark-vieira commented Oct 31, 2019

alpar-t commented Nov 11, 2019

Move periodic job to ES repo #48570

Move periodic job to ES repo #48570

Conversation

alpar-t commented Oct 28, 2019 • edited by mark-vieira Loading

elasticmachine commented Oct 28, 2019

rjernst left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

alpar-t commented Oct 29, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mark-vieira left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

alpar-t commented Oct 30, 2019

alpar-t commented Oct 30, 2019

alpar-t commented Oct 30, 2019

mark-vieira commented Oct 30, 2019

mark-vieira commented Oct 30, 2019

alpar-t commented Oct 31, 2019

mark-vieira commented Oct 31, 2019

alpar-t commented Nov 11, 2019

alpar-t commented Oct 28, 2019 •

edited by mark-vieira

Loading