Add cmd/config/config.go#41
Conversation
9bcade6 to
4dbdb9b
Compare
|
I added a CI check for a dirty config (one that was changed in oci/oci_config* but the config wasn't added to the PR). PTAL @cevich |
f0bae8b to
303e63d
Compare
Now, we can configure conmon from within the conmon repository. This will allow tools to vendor conmon and import the values they need, rather than having the configuration parameters in different repositories Also added runner/ package to store the configuration parameters Signed-off-by: Peter Hunt <pehunt@redhat.com>
|
@saschagrunert @rhatdan @mheon PTAL |
|
The C and Go look fine. I can't comment on the testing YAML or bash bits. |
|
looking... |
cevich
left a comment
There was a problem hiding this comment.
Looks good, just needs to re-use the gating container, and fixup the dependencies/depends_on.
a42e2b2 to
ee47cb0
Compare
|
Ugggg....my wires are totally crossed, taking a fresh look... |
|
Okay, remembering now this is actually the conmon repo. 😄 I think my maintenance concern is still valid, let's see if this can be made more "DRY" (untested - not sure this will work): diff --git a/.cirrus.yml b/.cirrus.yml
index 07c7b1c..3c9fb59 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -20,9 +20,11 @@ env:
TRAVIS: "true"
####
- #### Cache-image names to test with
+ #### Image names to test with
###
FEDORA_CACHE_IMAGE_NAME: 'fedora-29-conmon-75ea13be'
+ FEDOTA_CONTAINER_FQIN: 'registry.fedoraproject.org/fedora:29'
+ PRIOR_FEDORA_CONTAINER_FQIN: 'registry.fedoraproject.org/fedora:28'
####
#### Variables for composing new cache-images (used in PR testing) from
@@ -63,6 +65,9 @@ timeout_in: '120m'
# testing for every platform
integration_task:
+ depends_on:
+ - 'config'
+
gce_instance:
# Generate multiple parallel tasks, covering all possible
# 'matrix' combinations.
@@ -85,8 +90,8 @@ fedora_packaging_task:
# Runs within Cirrus's "community cluster"
container:
matrix:
- image: "registry.fedoraproject.org/fedora:28"
- image: "registry.fedoraproject.org/fedora:29"
+ image: "${FEDOTA_CONTAINER_FQIN}"
+ image: "${PRIOR_FEDORA_CONTAINER_FQIN}"
cpu: 4
memory: 12
@@ -111,7 +116,7 @@ config_task:
# fedora:28 doesn't have go mod by default
# and we should only need one check to make sure
# config changes were synced
- image: "registry.fedoraproject.org/fedora:29"
+ image: "${FEDOTA_CONTAINER_FQIN}"
cpu: 4
memory: 12
|
|
Reason I suggest making 'integration' depend on 'config is: "Fail fast". But I'm not actually sure if the config test failing would make the integration test results invalid or not. |
|
Otherwise, this LGTM 😄 |
|
let's try it out :D (it could make integration tests invalid, and also we'd spend money on spin cycles that would fail anyway) |
|
ya, z'ktly, and clearly there are no actual gating tests here, so it's a start. |
|
Neat it works, okay, well there ya go! Sorry for my confusion...it must have been very confusing 😁 |
|
(testing to verify it stops jobs if config fails) edit: works as expected :) |
Signed-off-by: Peter Hunt <pehunt@redhat.com>
|
@saschagrunert I'm tagging you to merge this if it looks good to you :) |
saschagrunert
left a comment
There was a problem hiding this comment.
Just one nit but this seems no blocker right now 👇
Now, we can configure conmon from within the conmon directory.
This will allow tools to vendor conmon and import the values they need, rather than having the configuration parameters in different repositories
This PR also comes with the eventual goal of coupling containers/conmon with the go code that calls it, so libraries that use conmon don't have to worry too much about conflicting versions
Signed-off-by: Peter Hunt pehunt@redhat.com