Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support CI testing against a bots project PR #233

Merged
merged 1 commit into from
Oct 2, 2019
Merged

Support CI testing against a bots project PR #233

merged 1 commit into from
Oct 2, 2019

Conversation

martinpitt
Copy link
Member

  • If $COCKPIT_BOTS_REF is set, check out that bots version instead of
    master.

  • Use git cache in $XDG_CACHE_HOME if available. Our CI uses that to
    save downloads, and it does not get in the way for local developers.

  • Stop making "bots" a phony target, and drop the now unnecessary
    [ -d bots ] check.

@martinpitt
Copy link
Member Author

This is currently done by make-checkout --bots-ref, but we want to get rid of that. It's too magic, and we already ran into troubles with that yesterday (see PR #232), and we want to simplify what the bots do as much as possible.

So the plan is:

  1. Land this change in all projects that use our CI
  2. Drop the --bots-ref stuff from make-checkout and change tests-scan to set COCKPIT_BOTS_REF instead of --bots-ref
  3. Clean up the rev vs. revision confusion in tests-scan vs. make-checkout

@martinpitt
Copy link
Member Author

Tested like this:

  • git clean -ffdx; make bots → bots is at master
  • git clean -ffdx; COCKPIT_BOTS_REF=pull/32/head make bots → git -C bots shortlog confirms that the head is "images: Shrink windows-10 image and install QRes"
  • A subsequent make bots says "make: 'bots' is up to date." and does not clobber the existing checkout.

croissanne
croissanne reviewed Oct 2, 2019
View reviewed changes
Makefile Outdated Show resolved Hide resolved
@martinpitt
Support CI testing against a bots project PR
3643ac2 
 * If `$COCKPIT_BOTS_REF` is set, check out that bots version instead of
   master.

 * Use git cache in $XDG_CACHE_HOME if available. Our CI uses that to
   save downloads, and it does not get in the way for local developers.

 * Stop making "bots" a phony target, and drop the now unnecessary
   `[ -d bots ]` check.

Closes cockpit-project#233
@martinpitt martinpitt merged commit bd0fea4 into cockpit-project:master Oct 2, 2019
@martinpitt martinpitt deleted the bots-ref branch October 2, 2019 12:31
martinpitt added a commit to martinpitt/cockpit-podman that referenced this pull request Oct 2, 2019
@martinpitt
Support CI testing against a bots project PR
4d687eb 
 * If `$COCKPIT_BOTS_REF` is set, check out that bots version instead of
   master.

 * Use git cache in $XDG_CACHE_HOME if available. Our CI uses that to
   save downloads, and it does not get in the way for local developers.

 * Stop making "bots" a phony target, and drop the now unnecessary
   `[ -d bots ]` check.

Ported from cockpit-project/starter-kit#233
@martinpitt martinpitt mentioned this pull request Oct 2, 2019
Merged
martinpitt added a commit to martinpitt/cockpit-ostree that referenced this pull request Oct 2, 2019
@martinpitt
Support CI testing against a bots project PR
2ed0edd 
 * If `$COCKPIT_BOTS_REF` is set, check out that bots version instead of
   master.

 * Use git cache in $XDG_CACHE_HOME if available. Our CI uses that to
   save downloads, and it does not get in the way for local developers.

 * Stop making "bots" a phony target, and drop the now unnecessary
   `[ -d bots ]` check.

Ported from cockpit-project/starter-kit#233
@martinpitt martinpitt mentioned this pull request Oct 2, 2019
Merged
martinpitt added a commit to martinpitt/cockpit-composer that referenced this pull request Oct 2, 2019
@martinpitt
Support CI testing against a bots project PR
7debc09 
 * If `$COCKPIT_BOTS_REF` is set, check out that bots version instead of
   master.

 * Use git cache in $XDG_CACHE_HOME if available. Our CI uses that to
   save downloads, and it does not get in the way for local developers.

 * Stop making "bots" a phony target, and drop the now unnecessary
   `[ -d bots ]` check.

Ported from cockpit-project/starter-kit#233
@martinpitt martinpitt mentioned this pull request Oct 2, 2019
Merged
martinpitt added a commit to martinpitt/cockpit that referenced this pull request Oct 2, 2019
@martinpitt
build: Support CI testing against a bots project PR
ee4ecfa 
 * If `$COCKPIT_BOTS_REF` is set, check out that bots version instead of
   master.

 * Use git cache in $XDG_CACHE_HOME if available. Our CI uses that to
   save downloads, and it does not get in the way for local developers.

 * Stop duplicating code in autogen.sh, just call `make bots`. The tree
   is configured at this point.

Ported from cockpit-project/starter-kit#233
@martinpitt martinpitt mentioned this pull request Oct 2, 2019
Merged
croissanne pushed a commit to cockpit-project/cockpit-podman that referenced this pull request Oct 2, 2019
@martinpitt @croissanne
Support CI testing against a bots project PR
a99d0dd 
* If `$COCKPIT_BOTS_REF` is set, check out that bots version instead of
   master.

 * Use git cache in $XDG_CACHE_HOME if available. Our CI uses that to
   save downloads, and it does not get in the way for local developers.

 * Stop making "bots" a phony target, and drop the now unnecessary
   `[ -d bots ]` check.

Ported from cockpit-project/starter-kit#233

Closes #215
croissanne pushed a commit to cockpit-project/cockpit-ostree that referenced this pull request Oct 2, 2019
@martinpitt @croissanne
Support CI testing against a bots project PR
e4ad2d9 
* If `$COCKPIT_BOTS_REF` is set, check out that bots version instead of
   master.

 * Use git cache in $XDG_CACHE_HOME if available. Our CI uses that to
   save downloads, and it does not get in the way for local developers.

 * Stop making "bots" a phony target, and drop the now unnecessary
   `[ -d bots ]` check.

Ported from cockpit-project/starter-kit#233

Closes #30
martinpitt added a commit to cockpit-project/cockpit that referenced this pull request Oct 2, 2019
@martinpitt
build: Support CI testing against a bots project PR
8a7067c 
* If `$COCKPIT_BOTS_REF` is set, check out that bots version instead of
   master.

 * Use git cache in $XDG_CACHE_HOME if available. Our CI uses that to
   save downloads, and it does not get in the way for local developers.

 * Stop duplicating code in autogen.sh, just call `make bots`. The tree
   is configured at this point.

Ported from cockpit-project/starter-kit#233

Closes #12908
henrywang pushed a commit to osbuild/cockpit-composer that referenced this pull request Oct 3, 2019
@martinpitt @henrywang
Support CI testing against a bots project PR
2e52165 
 * If `$COCKPIT_BOTS_REF` is set, check out that bots version instead of
   master.

 * Use git cache in $XDG_CACHE_HOME if available. Our CI uses that to
   save downloads, and it does not get in the way for local developers.

 * Stop making "bots" a phony target, and drop the now unnecessary
   `[ -d bots ]` check.

Ported from cockpit-project/starter-kit#233
martinpitt added a commit to weldr/lorax that referenced this pull request Oct 14, 2019
@martinpitt
Support CI testing against a bots project PR
a2c6738 
 * If `$COCKPIT_BOTS_REF` is set, check out that bots version instead of
   master.

 * Use git cache in $XDG_CACHE_HOME if available. Our CI uses that to
   save downloads, and it does not get in the way for local developers.

Adapted from cockpit-project/starter-kit#233
martinpitt added a commit to weldr/lorax that referenced this pull request Oct 15, 2019
@martinpitt
Support CI testing against a bots project PR
b899a67 
 * If `$COCKPIT_BOTS_REF` is set, check out that bots version instead of
   master.

 * Use git cache in $XDG_CACHE_HOME if available. Our CI uses that to
   save downloads, and it does not get in the way for local developers.

Adapted from cockpit-project/starter-kit#233

Cherry-picked from master commit a2c6738.
martinpitt added a commit to weldr/lorax that referenced this pull request Oct 15, 2019
@martinpitt
Support CI testing against a bots project PR
edde42a 
 * If `$COCKPIT_BOTS_REF` is set, check out that bots version instead of
   master.

 * Use git cache in $XDG_CACHE_HOME if available. Our CI uses that to
   save downloads, and it does not get in the way for local developers.

Adapted from cockpit-project/starter-kit#233

Cherry-picked from master commit a2c6738.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@croissanne croissanne croissanne approved these changes

@marusak marusak Awaiting requested review from marusak

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@martinpitt @croissanne