Merge pull request #61 from osmosis-labs/feat/add-osmo-test-5

Feat/add osmo test 5
osmosis-labs · Jul 12, 2023 · a1ea2eb · a1ea2eb
2 parents 77c3acb + 5b2d6c1
commit a1ea2eb
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/.github/workflows/test-client.yaml b/.github/workflows/test-client.yaml
@@ -15,14 +15,9 @@ jobs:
     name: test-installer-client
     runs-on: ${{ matrix.os }}
 
-    env:
-      TERM: xterm
-
     strategy:
       matrix:
-        # os: [ubuntu-latest, macos-latest]
-        # Can't execute on runner due to permission issues
-        os: [macos-latest]
+        os: [ubuntu-latest, macos-latest]
         network: [osmosis-1, osmo-test-5]
       fail-fast: false
 
@@ -37,6 +32,8 @@ jobs:
           python-version: '3.10'
       - 
         name: Run Installer
+        env:
+          TERM: xterm
         run: |
           python installer.py \
             --install client \

diff --git a/installer.py b/installer.py
@@ -134,8 +134,8 @@ def __init__(self, chain_id, version, genesis_url, binary_url, peers, rpc_node,
     genesis_url = "https://osmosis.fra1.digitaloceanspaces.com/osmo-test-5/genesis.json",
     binary_url = {
         "linux": {
-            "amd64": "https://github.com/niccoloraspa/osmosis/releases/download/v16.0.0-rc2-testnet/osmosisd-16.0.0-rc2-testnet-linux-amd64",
-            "arm64": "https://github.com/niccoloraspa/osmosis/releases/download/v16.0.0-rc2-testnet/osmosisd-16.0.0-rc2-testnet-linux-arm64"
+            "amd64": "https://github.com/osmosis-labs/osmosis/releases/download/v16.0.0-rc2/osmosisd-16.0.0-rc2-testnet-linux-amd64",
+            "arm64": "https://github.com/osmosis-labs/osmosis/releases/download/v16.0.0-rc2/osmosisd-16.0.0-rc2-testnet-linux-arm64"
         },
         "darwin": {
             "amd64": "https://github.com/niccoloraspa/osmosis/releases/download/v16.0.0-rc2-testnet/osmosisd-16.0.0-rc2-testnet-darwin-amd64",
@@ -160,12 +160,12 @@ def __init__(self, chain_id, version, genesis_url, binary_url, peers, rpc_node,
     genesis_url = "https://osmosis.fra1.digitaloceanspaces.com/osmosis-1/genesis.json",
     binary_url = {
         # "linux": {
-        #     "amd64": "https://github.com/osmosis-labs/osmosis/releases/download/v15.2.0/osmosisd-15.2.0-linux-amd64",
+        #     "amd64": "",
         #     "arm64": "https://github.com/osmosis-labs/osmosis/releases/download/v15.2.0/osmosisd-15.2.0-linux-arm64",
         # }
         "linux": {
-            "amd64": "https://github.com/niccoloraspa/osmosis/releases/download/v16.0.0/osmosisd-16.0.0-linux-amd64",
-            "arm64": "https://github.com/niccoloraspa/osmosis/releases/download/v16.0.0/osmosisd-16.0.0-linux-arm64"
+            "amd64": "https://github.com/osmosis-labs/osmosis/releases/download/v16.0.0/osmosisd-16.0.0-linux-amd64",
+            "arm64": "https://github.com/osmosis-labs/osmosis/releases/download/v16.0.0/osmosisd-16.0.0-linux-arm64"
         },
         "darwin": {
             "amd64": "https://github.com/niccoloraspa/osmosis/releases/download/v16.0.0/osmosisd-16.0.0-darwin-amd64",
@@ -226,7 +226,7 @@ def client_complete_message():
 ✨ Congratulations! You have successfully completed setting up an Osmosis client! ✨
 """ + bcolors.ENDC)
 
-    print("🧪 Try running: " + bcolors.OKGREEN + "osmosisd status" + bcolors.ENDC)
+    print("🧪 Try running: " + bcolors.OKGREEN + f"osmosisd status --home {args.home}" + bcolors.ENDC)
     print()
 
 # Options
@@ -655,9 +655,16 @@ def download_binary(network):
 
         subprocess.run(["wget", binary_url,"-q", "-O", "/tmp/osmosisd"], check=True)
         os.chmod("/tmp/osmosisd", 0o755)
-        subprocess.run(["mv", "/tmp/osmosisd", binary_path], check=True)
+
+        if platform.system() == "Linux":
+            subprocess.run(["sudo", "mv", "/tmp/osmosisd", binary_path], check=True)
+            subprocess.run(["sudo", "chown", f"{os.environ['USER']}:{os.environ['USER']}", binary_path], check=True)
+            subprocess.run(["sudo", "chmod", "+x", binary_path], check=True)
+        else:
+            subprocess.run(["mv", "/tmp/osmosisd", binary_path], check=True)
 
         # Test binary 
+        subprocess.run(["which", "osmosisd"], check=True)
         subprocess.run(["osmosisd", "version"], check=True)
 
         print("Binary downloaded successfully.")