From 30d34196014d26833bb14ce285eeac934bd45d4a Mon Sep 17 00:00:00 2001
From: Stu Charlton <scharlton@vmware.com>
Date: Thu, 9 Jul 2020 15:23:54 -0600
Subject: [PATCH 1/2] Fix wildcard

---
 packages/etcd/packaging | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/etcd/packaging b/packages/etcd/packaging
index 189831c..3879725 100644
--- a/packages/etcd/packaging
+++ b/packages/etcd/packaging
@@ -3,7 +3,7 @@ set -e
 ### NOTE: we usually use the same version for both etcd and etcdctl, but due to a defect introduced in
 ### etcdctl 3.3.14, we're mixing the new version of the etcd server (3.3.17) with an older version of etcdctl (3.3.12)
 ETCD_PACKAGE=etcd
-ETCD_VERSION="3.3.*"
+ETCD_VERSION="3.3.22"
 ETCD_EXTRACT_DIR="etcd-${ETCD_VERSION}"
 ETCDCTL_VERSION="3.3.12"
 ETCDCTL_EXTRACT_DIR="etcd-${ETCDCTL_VERSION}"

From 0a8c17ade24ad0df5f1aa81f2445a5e0544838fc Mon Sep 17 00:00:00 2001
From: Stu Charlton <scharlton@vmware.com>
Date: Thu, 9 Jul 2020 15:32:18 -0600
Subject: [PATCH 2/2] final release 1.12.4

---
 .final_builds/packages/etcd/index.yml   |  4 ++
 releases/cfcr-etcd/cfcr-etcd-1.12.4.yml | 49 +++++++++++++++++++++++++
 releases/cfcr-etcd/index.yml            |  2 +
 3 files changed, 55 insertions(+)
 create mode 100644 releases/cfcr-etcd/cfcr-etcd-1.12.4.yml

diff --git a/.final_builds/packages/etcd/index.yml b/.final_builds/packages/etcd/index.yml
index be9f664..9a67834 100644
--- a/.final_builds/packages/etcd/index.yml
+++ b/.final_builds/packages/etcd/index.yml
@@ -35,6 +35,10 @@ builds:
     version: ecd44062ba6171205f6eadb1aeaef05aaa5ca64b3c2203cfc8dd9b8f1a5e79b8
     blobstore_id: 159c33d3-05fc-48d8-5d27-aadb89605b87
     sha1: sha256:1a18198c084de0455abd61dfca8508dbc0445830004a3ab17ebe8ff94c819862
+  f1c2baa237f31bd1bec95586ef252131388942ca6a0e75191e385f9ebaed073a:
+    version: f1c2baa237f31bd1bec95586ef252131388942ca6a0e75191e385f9ebaed073a
+    blobstore_id: cc60437a-3dcb-4bd7-7a67-a3323d91d52a
+    sha1: sha256:103c70bba40b92a0f8c58e76b31534b434b28e0bc1445708d0de7e9a84360567
   f73cc4936dfaa341af9e1b088fbd70a4ee2b18d90d3b92ba8f3333a043110fe0:
     version: f73cc4936dfaa341af9e1b088fbd70a4ee2b18d90d3b92ba8f3333a043110fe0
     blobstore_id: 82e98ede-c91c-415a-7e13-b57fd03b01b0
diff --git a/releases/cfcr-etcd/cfcr-etcd-1.12.4.yml b/releases/cfcr-etcd/cfcr-etcd-1.12.4.yml
new file mode 100644
index 0000000..5e85ff7
--- /dev/null
+++ b/releases/cfcr-etcd/cfcr-etcd-1.12.4.yml
@@ -0,0 +1,49 @@
+name: cfcr-etcd
+version: 1.12.4
+commit_hash: 30d3419
+uncommitted_changes: true
+jobs:
+- name: acceptance-tests
+  version: ff3cefa9bd60330af247a83b7346c5be161e8496c613f1b88f0174f3ad1e9b61
+  fingerprint: ff3cefa9bd60330af247a83b7346c5be161e8496c613f1b88f0174f3ad1e9b61
+  sha1: sha256:a35d113c2014c458f117d2c1ea0cd075266089587ae323fce0298edd1fc811b8
+  packages:
+  - acceptance
+  - golang-1.13-linux
+- name: bbr-etcd
+  version: b70183a25575f474a4c137632c46dc175ab32281cd2e2005f148c16cbe02f98b
+  fingerprint: b70183a25575f474a4c137632c46dc175ab32281cd2e2005f148c16cbe02f98b
+  sha1: sha256:88082b51d0cb4c42eacd82930e5f23d3c124bddf58d7636e448ea790bfb3958a
+  packages: []
+- name: dummy-aliases
+  version: 02e9b165a2163e79a4be7d5e40930528ede8948c34943d61b7a4d8af56eedad8
+  fingerprint: 02e9b165a2163e79a4be7d5e40930528ede8948c34943d61b7a4d8af56eedad8
+  sha1: sha256:94eda902a3d192d14c67f94b1505ce484029450b948e19509552620e8cf0ba82
+  packages: []
+- name: etcd
+  version: 427f9e442453b9bf5ebd7e882aa799fd7a47304dd18d09753efb49e16341a531
+  fingerprint: 427f9e442453b9bf5ebd7e882aa799fd7a47304dd18d09753efb49e16341a531
+  sha1: sha256:2eec30f825ec7b953687ad62cc358f1befb827db51b579a52a2af395741cf01d
+  packages:
+  - etcd
+packages:
+- name: acceptance
+  version: ac3b53a8bc7c4a41bbe80079768f46dfa48eecc5c1bd68ac3b490ab657b3973c
+  fingerprint: ac3b53a8bc7c4a41bbe80079768f46dfa48eecc5c1bd68ac3b490ab657b3973c
+  sha1: sha256:ba61fb1c047d957721f436a757bebed7c6f1150fe52403d4478aaf9dfedf8def
+  dependencies:
+  - golang-1.13-linux
+- name: etcd
+  version: f1c2baa237f31bd1bec95586ef252131388942ca6a0e75191e385f9ebaed073a
+  fingerprint: f1c2baa237f31bd1bec95586ef252131388942ca6a0e75191e385f9ebaed073a
+  sha1: sha256:103c70bba40b92a0f8c58e76b31534b434b28e0bc1445708d0de7e9a84360567
+  dependencies: []
+- name: golang-1.13-linux
+  version: 20234d0cb26adec9565b926f59fa4f7a2ea9e4f230af800fa9a36c8b5f2a8eaa
+  fingerprint: 20234d0cb26adec9565b926f59fa4f7a2ea9e4f230af800fa9a36c8b5f2a8eaa
+  sha1: sha256:660936725d973c27d36bd021cee3905616eb68583ba8199f83b8c0dd4fe259a2
+  dependencies: []
+license:
+  version: 8b3244f5084173690ae185af56279c848184813060a9472ee033472a5d17ee64
+  fingerprint: 8b3244f5084173690ae185af56279c848184813060a9472ee033472a5d17ee64
+  sha1: sha256:be1a860217c73629cc059cdce24c1e178bd7b4b7f7f5e1fb6c6610a18508186b
diff --git a/releases/cfcr-etcd/index.yml b/releases/cfcr-etcd/index.yml
index 430bee5..6514756 100644
--- a/releases/cfcr-etcd/index.yml
+++ b/releases/cfcr-etcd/index.yml
@@ -1,6 +1,8 @@
 builds:
   01bb0b6c-fc65-4e65-73d0-faf19bfea675:
     version: "1.3"
+  07e3315d-99c9-4238-4323-e3462771829d:
+    version: 1.12.4
   29ec8faa-6f20-494d-6739-63fabd7c7f7b:
     version: "1.2"
   35a9c7ad-1452-4551-7548-b54f84fc12ab: