Skip to content

Commit

Permalink
merge origin
Browse files Browse the repository at this point in the history
  • Loading branch information
Pixcell committed Jul 15, 2020
2 parents 514e89d + b1fdf42 commit db603ec
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 6 deletions.
4 changes: 2 additions & 2 deletions bootstrap.sh
Expand Up @@ -53,11 +53,11 @@ install_iofogctl(){
case "$DIST" in
*ubuntu*|*debian*|*raspbian*)
curl https://packagecloud.io/install/repositories/iofog/iofogctl/script.deb.sh | sudo bash
sudo apt-get install iofogctl=2.0.0-rc1
sudo apt-get install iofogctl=2.0.0-rc3
;;
*fedora*|*centos*)
curl https://packagecloud.io/install/repositories/iofog/iofogctl/script.rpm.sh | sudo bash
sudo yum install iofogctl-2.0.0-rc1-1.x86_64
sudo yum install iofogctl-2.0.0_rc3-1.x86_64
;;
*)
echo "Failed to install iofogctl"
Expand Down
3 changes: 2 additions & 1 deletion init/tutorial/config.yaml
Expand Up @@ -44,4 +44,5 @@ spec:
env: []
routes:
- from: Sensors
to: Rest API
to: Rest API
name: sensor-to-rest
4 changes: 2 additions & 2 deletions start.sh
Expand Up @@ -84,8 +84,8 @@ startEnvironment() {

ENVIRONMENT=''
IOFOG_BUILD_NO_CACHE=''
AGENT_IMAGE='docker.io/iofog/agent:2.0.0-rc1'
CONTROLLER_IMAGE='docker.io/iofog/controller:2.0.0-rc1'
AGENT_IMAGE='docker.io/iofog/agent:2.0.0-rc2'
CONTROLLER_IMAGE='docker.io/iofog/controller:2.0.0-rc2'
while [[ "$#" -ge 1 ]]; do
case "$1" in
-h|--help)
Expand Down
1 change: 1 addition & 0 deletions templates/job.yaml
Expand Up @@ -61,6 +61,7 @@ jobs:
# displayName: 'Pull latest images'

- script: |
$(cssh) $(agent) -- cat $(dir)/init/tutorial/config.yaml
$(cssh) $(agent) -- bash $(dir)/start.sh tutorial
# Use dev version of agent and controller until 1.3.0 release
# ./start.sh -ct gcr.io/focal-freedom-236620/controller:develop -a gcr.io/focal-freedom-236620/agent:develop
Expand Down
2 changes: 1 addition & 1 deletion test.sh
Expand Up @@ -40,6 +40,6 @@ echoInfo "Running Test Runner..."
docker run --rm --name test-runner --network host \
-v ~/.iofog/:/root/.iofog/ \
-v /var/run/docker.sock:/var/run/docker.sock \
iofog/test-runner:2.0.0-rc1
iofog/test-runner:2.0.0-rc3

echoNotify "## Test Runner Tests complete"

0 comments on commit db603ec

Please sign in to comment.