From 6ed409be6cf4e49d3c67eedd5d963b7490d41981 Mon Sep 17 00:00:00 2001
From: Matt Thompson <mattt@defunct.ca>
Date: Tue, 29 May 2018 14:24:40 -0400
Subject: [PATCH] Update component dependency requirements

We also rename hook dirs and fix gating scripts.
---
 component_requirements.yml           | 13 +++++++------
 gating/check                         |  1 -
 gating/{pre_merge_test => check}/pre | 20 ++++++++------------
 gating/{pre_merge_test => check}/run |  0
 gating/periodic                      |  2 +-
 gating/post_merge_test               |  1 -
 gating/release                       |  2 +-
 7 files changed, 17 insertions(+), 22 deletions(-)
 delete mode 120000 gating/check
 rename gating/{pre_merge_test => check}/pre (61%)
 rename gating/{pre_merge_test => check}/run (100%)
 delete mode 120000 gating/post_merge_test

diff --git a/component_requirements.yml b/component_requirements.yml
index c1258a7..f8ef001 100644
--- a/component_requirements.yml
+++ b/component_requirements.yml
@@ -1,13 +1,14 @@
+# Do not modify by hand. This file is automatically generated from the required dependencies and the constraints specified for them.
 dependencies:
 - name: rpc-component-1
-  ref: 1.1.3
+  ref: 1.0.1
   ref_type: tag
   repo_url: https://github.com/mattt416/rpc-component-1
-  sha: 4e47e7232fc456bc9277526c39831b1450fe50de
-  version: 1.1.3
+  sha: 7a0b674ad92aa0e63f185a1aaa7830c584b9c123
+  version: 1.0.1
 - name: rpc-component-2
-  ref: r1.2.0
+  ref: 1.0.1
   ref_type: tag
   repo_url: https://github.com/mattt416/rpc-component-2
-  sha: abc7e24028e8b52e488e32e1abfff6168c4ac7ff
-  version: r1.2.0
+  sha: 7646f1d0ef46b997fa976efb1faa99c47b2e6cb4
+  version: 1.0.1
diff --git a/gating/check b/gating/check
deleted file mode 120000
index cc51825..0000000
--- a/gating/check
+++ /dev/null
@@ -1 +0,0 @@
-pre_merge_test
\ No newline at end of file
diff --git a/gating/pre_merge_test/pre b/gating/check/pre
similarity index 61%
rename from gating/pre_merge_test/pre
rename to gating/check/pre
index 0ce57aa..e263d67 100755
--- a/gating/pre_merge_test/pre
+++ b/gating/check/pre
@@ -19,29 +19,25 @@ apt-get install -y python-pip python-virtualenv
 #
 ## Grab top level metadata repo, this is necessary to obtain component repo URLs
 #git.Repo.clone_from(
-#    'https://github.com/mattt416/rpc-metadata',
-#    '/opt/rpc-metadata'
+#    'https://github.com/rcbops/releases',
+#    '/opt/releases'
 #)
 #
 #for dep in dep_metadata['dependencies']:
-#    component_metadata = yaml.safe_load(open('/opt/rpc-metadata/%s.yml' % dep['name']).read())
+#    component_metadata = yaml.safe_load(open('/opt/releases/%s.yml' % dep['name']).read())
 #    clone_dir = '/opt/%s' % dep['name']
 #    print('Cloning %s to %s ...' % (dep['name'], clone_dir))
 #    repo = git.Repo.clone_from(component_metadata['repo'], clone_dir)
 #    repo.git.checkout(dep['sha'])
 #END
 
-# Until https://github.com/mattt416/rpc-metadata/pull/1, we need to pull down a WIP branch
-git clone https://github.com/mattt416/rpc-metadata/ /opt/rpc-metadata
-pushd /opt/rpc-metadata
+git clone https://github.com/rcbops/rpc_component/
+pushd rpc_component
   virtualenv --python=python3 .venv
   set +u
   source .venv/bin/activate
   set -u
-  pip install -c constraints.txt -r requirements.txt
-  pushd rpc_component
-    pip install .
-  popd
+  pip install .
 popd
 
 component dependency download-requirements --download-dir /opt
@@ -49,5 +45,5 @@ component dependency download-requirements --download-dir /opt
 deactivate
 
 echo "Deploying components ..."
-/opt/rpc-component-1/gating/pre_merge_test/run
-/opt/rpc-component-2/gating/pre_merge_test/run
+/opt/rpc-component-1/gating/check/run
+/opt/rpc-component-2/gating/check/run
diff --git a/gating/pre_merge_test/run b/gating/check/run
similarity index 100%
rename from gating/pre_merge_test/run
rename to gating/check/run
diff --git a/gating/periodic b/gating/periodic
index 0b458e1..4c04caa 120000
--- a/gating/periodic
+++ b/gating/periodic
@@ -1 +1 @@
-post_merge_test
\ No newline at end of file
+check
\ No newline at end of file
diff --git a/gating/post_merge_test b/gating/post_merge_test
deleted file mode 120000
index cc51825..0000000
--- a/gating/post_merge_test
+++ /dev/null
@@ -1 +0,0 @@
-pre_merge_test
\ No newline at end of file
diff --git a/gating/release b/gating/release
index cc51825..4c04caa 120000
--- a/gating/release
+++ b/gating/release
@@ -1 +1 @@
-pre_merge_test
\ No newline at end of file
+check
\ No newline at end of file