Merge branch 'develop' into release/1.3.0

eclipse-iofog · Nov 6, 2019 · 363319f · 363319f
2 parents 74567ed + c74ebf2
commit 363319f
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 22 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -1,9 +1,17 @@
 trigger:
   - master
   - develop
+  - release/*
 pr:
   - master
   - develop
+schedules:
+- cron: "0 0 * * *"
+  displayName: Daily build (UTC)
+  branches:
+    include:
+    - master
+    - develop
 
 pool:
   vmImage: 'ubuntu-16.04'
@@ -17,22 +25,16 @@ steps:
     releaseType: stable
 
 - script: |
-    https://packagecloud.io/install/repositories/iofog/iofogctl/script.deb.sh | sudo bash
+    # curl -s https://packagecloud.io/install/repositories/iofog/iofogctl/script.deb.sh | sudo bash
     # Using dev version of iofogctl until 1.3.0 release
-    # curl -s https://8c90601638aff0b3fb520971175089bbaba2cf7f29be9528:@packagecloud.io/install/repositories/iofog/iofogctl-snapshots/script.deb.sh | sudo bash
-    sudo apt install iofogctl
+    curl -s https://8c90601638aff0b3fb520971175089bbaba2cf7f29be9528:@packagecloud.io/install/repositories/iofog/iofogctl-snapshots/script.deb.sh | sudo bash
+    sudo apt install iofogctl=1.3.0-dev
   displayName: 'Install iofogctl'
 
 - script: |
     echo $(gcp.svcacc) | docker login -u _json_key --password-stdin https://gcr.io
   displayName: 'Docker connect to Registry'
 
-# - script: |
-#     docker pull gcr.io/focal-freedom-236620/controller:develop
-#     docker pull gcr.io/focal-freedom-236620/connector:develop
-#     docker pull gcr.io/focal-freedom-236620/agent:develop
-#   displayName: 'Pull latest images'
-
 - script: |
     ./start.sh tutorial
     # Use dev version of agent and controller until 1.3.0 release

diff --git a/test.sh b/test.sh
@@ -31,7 +31,7 @@ IOFOG_RUNNING=$(docker inspect -f '{{.State.Running}}' iofog-agent iofog-connect
 if [[ "${IOFOG_RUNNING}" == "truetruetrue" ]]; then
     echoInfo "ioFog stack is running"
 else
-    echoError 'ioFog stack is not running! Please run `./start.sh iofog` first'
+    echoError 'ioFog stack is not running! Please run `./start.sh` first'
     exit 2
 fi
 
@@ -46,18 +46,41 @@ AGENT_CONTAINER_ID=$(docker ps -q --filter="name=iofog-agent")
 
 # Configuring ssh on the agent
 echoInfo "Configuring ssh on the Agent"
-docker exec iofog-agent sudo rm /var/lib/apt/lists/lock > /dev/null 2>&1
-docker exec iofog-agent apt-get update -qq > /dev/null 2>&1
-docker exec iofog-agent apt-get install -qqy openssh-server > /dev/null 2>&1 || docker exec iofog-agent apt-get install -qqfy > /dev/null 2>&1
-docker exec iofog-agent mkdir -p /root/.ssh > /dev/null 2>&1
-docker exec iofog-agent chmod 700 /root/.ssh > /dev/null 2>&1
-docker cp test/conf/id_ecdsa.pub "$AGENT_CONTAINER_ID:/root/.ssh/authorized_keys" > /dev/null 2>&1
-docker exec iofog-agent chmod 644 /root/.ssh/authorized_keys > /dev/null 2>&1
-docker exec iofog-agent chown root:root /root/.ssh/authorized_keys > /dev/null 2>&1
-docker exec iofog-agent mkdir -p /var/run/sshd > /dev/null 2>&1
-docker exec iofog-agent sudo sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so@g' -i /etc/pam.d/sshd > /dev/null 2>&1
-docker exec iofog-agent sudo sed 's@#AuthorizedKeysFile	%h/.ssh/authorized_keys@AuthorizedKeysFile	%h/.ssh/authorized_keys@g' -i /etc/ssh/sshd_config > /dev/null 2>&1
-docker exec iofog-agent /bin/bash -c 'service ssh restart' > /dev/null 2>&1
+# Init log file
+configureSSHLogFile=/tmp/configure_ssh.log
+if [ -f $configureSSHLogFile ]; then
+    rm $configureSSHLogFile
+fi
+echo '' > $configureSSHLogFile
+{
+    echo 'Removing /var/lib/apt/lists/lock' >> $configureSSHLogFile
+    docker exec iofog-agent sudo rm /var/lib/apt/lists/lock >> $configureSSHLogFile 2>&1
+    echo 'Updating apt-get' >> $configureSSHLogFile
+    docker exec iofog-agent apt-get update -y  >> $configureSSHLogFile 2>&1
+    echo 'Installing Openssh-server' >> $configureSSHLogFile
+    docker exec iofog-agent apt-get install -y --fix-missing openssh-server  >> $configureSSHLogFile 2>&1
+    echo 'Running apt-get install -fy' >> $configureSSHLogFile
+    docker exec iofog-agent apt-get install -fy  >> $configureSSHLogFile 2>&1
+    echo 'Creating ~/.ssh' >> $configureSSHLogFile
+    docker exec iofog-agent mkdir -p /root/.ssh  >> $configureSSHLogFile 2>&1
+    docker exec iofog-agent chmod 700 /root/.ssh  >> $configureSSHLogFile 2>&1
+    echo 'Copying public key to ~/.ssh/authorized_keys' >> $configureSSHLogFile
+    docker cp test/conf/id_ecdsa.pub "$AGENT_CONTAINER_ID:/root/.ssh/authorized_keys"  >> $configureSSHLogFile 2>&1
+    docker exec iofog-agent chmod 644 /root/.ssh/authorized_keys  >> $configureSSHLogFile 2>&1
+    docker exec iofog-agent chown root:root /root/.ssh/authorized_keys  >> $configureSSHLogFile 2>&1
+    echo 'Creating /var/run/.sshd' >> $configureSSHLogFile
+    docker exec iofog-agent mkdir -p /var/run/sshd  >> $configureSSHLogFile 2>&1
+    echo 'Updating /etc/pam.d/sshd' >> $configureSSHLogFile
+    docker exec iofog-agent sudo sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so@g' -i /etc/pam.d/sshd  >> $configureSSHLogFile 2>&1
+    echo 'Updating /etc/ssh/sshd_config' >> $configureSSHLogFile
+    docker exec iofog-agent sudo sed 's@#AuthorizedKeysFile	%h/.ssh/authorized_keys@AuthorizedKeysFile	%h/.ssh/authorized_keys@g' -i /etc/ssh/sshd_config  >> $configureSSHLogFile 2>&1
+    echo 'Restarting ssh service' >> $configureSSHLogFile
+    docker exec iofog-agent /bin/bash -c 'service ssh restart'  >> $configureSSHLogFile 2>&1
+} || {
+    echoError "Failed to configure ssh on agent container"
+    cat $configureSSHLogFile
+    exit 1
+}
 
 echoInfo "Running Test Runner..."
 docker run --rm --name test-runner --network local-iofog-network \