diff options
| author | Chris Evich <cevich@redhat.com> | 2018-10-16 17:16:29 -0400 |
|---|---|---|
| committer | Chris Evich <cevich@redhat.com> | 2018-10-18 12:37:08 -0400 |
| commit | a18494a345920bfbfa0c4db50731fd21f6ef7cd2 (patch) | |
| tree | dc7e4e41e18af55964de93b29f6cb584d59b9ff2 | |
| parent | 02bc3c9962f8d80a239bba1a6c8bd97d1c5ba44c (diff) | |
| download | podman-a18494a345920bfbfa0c4db50731fd21f6ef7cd2.tar.gz podman-a18494a345920bfbfa0c4db50731fd21f6ef7cd2.tar.bz2 podman-a18494a345920bfbfa0c4db50731fd21f6ef7cd2.zip | |
Cirrus: Use different CNI_COMMIT for Fedora
Just noticed this in Dockerfile.Fedora. Updated all the right
places to make this happen.
Signed-off-by: Chris Evich <cevich@redhat.com>
| -rw-r--r-- | .cirrus.yml | 1 | ||||
| -rw-r--r-- | contrib/cirrus/packer/libpod_images.json | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index f59dd9396..04640662d 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -16,6 +16,7 @@ gce_instance: # Main collection of env. varss to set for all scripts. All others # are cooked in by $SCRIPT_BASE/setup_environment.sh env: + FEDORA_CNI_COMMIT: "412b6d31280682bb4fab4446f113c22ff1886554" CNI_COMMIT: "7480240de9749f9a0a5c8614b17f1f03e0c06ab9" CRIO_COMMIT: "662dbb31b5d4f5ed54511a47cde7190c61c28677" RUNC_COMMIT: "ad0f5255060d36872be04de22f8731f38ef2d7b1" diff --git a/contrib/cirrus/packer/libpod_images.json b/contrib/cirrus/packer/libpod_images.json index ec2641282..2135adef5 100644 --- a/contrib/cirrus/packer/libpod_images.json +++ b/contrib/cirrus/packer/libpod_images.json @@ -1,5 +1,6 @@ { "variables": { + "FEDORA_CNI_COMMIT": "{{env `FEDORA_CNI_COMMIT`}}", "CNI_COMMIT": "{{env `CNI_COMMIT`}}", "CRIO_COMMIT": "{{env `CRIO_COMMIT`}}", "RUNC_COMMIT": "{{env `RUNC_COMMIT`}}", @@ -105,7 +106,7 @@ "script": "{{user `GOSRC`}}/{{user `PACKER_BASE`}}/fedora_setup.sh", "environment_vars": [ "SCRIPT_BASE={{user `SCRIPT_BASE`}}", - "CNI_COMMIT={{user `CNI_COMMIT`}}", + "CNI_COMMIT={{user `FEDORA_CNI_COMMIT`}}", "CRIO_COMMIT={{user `CRIO_COMMIT`}}", "RUNC_COMMIT={{user `RUNC_COMMIT`}}" ] |