Fix hub CI (#86)

crowdsecurity · Jun 24, 2020 · bdda082 · bdda082
1 parent 02351e9
commit bdda082
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/hub-ci.yml b/.github/workflows/hub-ci.yml
@@ -43,6 +43,6 @@ jobs:
       run: |
         for i in `find ./tests -mindepth 1 -maxdepth 1 -type d` ; do 
           echo "::group::Test-${i}" ; 
-          ./main $i || (echo "::error file=${i}::Failed test for ${i}" ; diff ${i}"/results.yaml" ${i}"/results.yaml.fail") ;
+          ./main -c dev.yaml $i || (echo "::error file=${i}::Failed test for ${i}" ; diff ${i}"/results.json" ${i}"/results.json.fail") ;
           echo "::endgroup::" ;
         done ;
diff --git a/cmd/crowdsec-cli/backup-restore.go b/cmd/crowdsec-cli/backup-restore.go
@@ -415,7 +415,7 @@ cscli backup restore ./my-backup`,
 			}
 			outputCTX, err = outputs.NewOutput(&outputConfig, false)
 			if err != nil {
-				log.Fatalf("Failed to load output plugins")
+				log.Fatalf("Failed to load output plugins : %v", err)
 			}
 			if err := cwhub.GetHubIdx(); err != nil {
 				log.Fatalf("Failed to get Hub index : %v", err)
@@ -456,7 +456,7 @@ cscli backup restore ./my-backup`,
 			}
 			outputCTX, err = outputs.NewOutput(&outputConfig, false)
 			if err != nil {
-				log.Fatalf("Failed to load output plugins")
+				log.Fatalf("Failed to load output plugins : %v", err)
 			}
 
 			if err := cwhub.GetHubIdx(); err != nil {

diff --git a/wizard.sh b/wizard.sh
@@ -314,14 +314,14 @@ update_full() {
     fi
 
     log_info "Backing up existing configuration"
-    ${CSCLI_BIN} backup save ${BACKUP_DIR}
+    ${CSCLI_BIN_INSTALLED} backup save ${BACKUP_DIR}
     log_info "Cleanup existing crowdsec configuration"
     uninstall_crowdsec
     log_info "Installing crowdsec"
     install_crowdsec
     log_info "Restoring configuration"
-    ${CSCLI_BIN} update
-    ${CSCLI_BIN} backup restore ${BACKUP_DIR}
+    ${CSCLI_BIN_INSTALLED} update
+    ${CSCLI_BIN_INSTALLED} backup restore ${BACKUP_DIR}
     log_info "Finished, restarting"
     systemctl restart crowdsec || log_err "Failed to restart crowdsec"
 }