From 4e2daa783caae54e3f3b1ce6bc3a15ac7d561a65 Mon Sep 17 00:00:00 2001
From: Greg Fodor <gfodor@gmail.com>
Date: Wed, 1 Aug 2018 02:42:37 +0000
Subject: [PATCH] Move to dev janus server by default
---
Jenkinsfile | 3 ++-
scripts/default.env | 2 +-
scripts/hab-build-and-push.sh | 7 ++++---
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index b5b5499fe..eb9ac1c93 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -35,9 +35,10 @@ pipeline {
def assetBundleServer = env.ASSET_BUNDLE_SERVER
def targetS3Url = env.TARGET_S3_URL
def smokeURL = env.SMOKE_URL
+ def janusServer = env.JANUS_SERVER
def slackURL = env.SLACK_URL
- def habCommand = "sudo /usr/bin/hab-docker-studio -k mozillareality run /bin/bash scripts/hab-build-and-push.sh ${baseAssetsPath} ${assetBundleServer} ${targetS3Url} ${env.BUILD_NUMBER} ${env.GIT_COMMIT}"
+ def habCommand = "sudo /usr/bin/hab-docker-studio -k mozillareality run /bin/bash scripts/hab-build-and-push.sh ${baseAssetsPath} ${assetBundleServer} ${janusServer} ${targetS3Url} ${env.BUILD_NUMBER} ${env.GIT_COMMIT}"
sh "/usr/bin/script --return -c ${shellString(habCommand)} /dev/null"
def gitMessage = sh(returnStdout: true, script: "git log -n 1 --pretty=format:'[%an] %s'").trim()
diff --git a/scripts/default.env b/scripts/default.env
index ebf2f80d9..060817822 100644
--- a/scripts/default.env
+++ b/scripts/default.env
@@ -2,6 +2,6 @@
# You can find more information about getting your own origin trial token here: https://github.com/GoogleChrome/OriginTrials/blob/gh-pages/developer-guide.md
ORIGIN_TRIAL_TOKEN="AmTuFlYFGJ4KEbPVE20U0qoWZI3NZuaO8bjjcQvQI4OvDVC4Iyun5gkD8lwtNbrEzh617m5nig0+8QC+Pz6powYAAABVeyJvcmlnaW4iOiJodHRwczovL2h1YnMubW96aWxsYS5jb206NDQzIiwiZmVhdHVyZSI6IldlYlZSMS4xTTYyIiwiZXhwaXJ5IjoxNTM0ODg3ODE1fQ=="
ORIGIN_TRIAL_EXPIRES="2018-08-21"
-JANUS_SERVER="wss://prod-janus.reticulum.io"
+JANUS_SERVER="wss://dev-janus.reticulum.io"
DEV_RETICULUM_SERVER="dev.reticulum.io"
ASSET_BUNDLE_SERVER="https://asset-bundles-prod.reticulum.io"
diff --git a/scripts/hab-build-and-push.sh b/scripts/hab-build-and-push.sh
index a9290dff3..031815126 100755
--- a/scripts/hab-build-and-push.sh
+++ b/scripts/hab-build-and-push.sh
@@ -2,9 +2,10 @@
export BASE_ASSETS_PATH=$1
export ASSET_BUNDLE_SERVER=$2
-export TARGET_S3_URL=$3
-export BUILD_NUMBER=$4
-export GIT_COMMIT=$5
+export JANUS_SERVER=$3
+export TARGET_S3_URL=$4
+export BUILD_NUMBER=$5
+export GIT_COMMIT=$6
export BUILD_VERSION="${BUILD_NUMBER} (${GIT_COMMIT})"
# To build + push to S3 run:
--
GitLab