remove changes from deleted fix-zos-urls branch

Author: Eslam-Nawara

.github/workflows/bin-package-18.04.yaml

@@ -48,8 +48,6 @@ jobs:
         with:
           token: ${{ secrets.token }}
           action: publish
-          baseurl: "https://hub.threefold.me"
-          backend: "hub.threefold.me:9980"
           user: tf-autobuilder
           root: bins/releases/${{ inputs.package }}
           name: ${{ steps.package.outputs.name }}.flist
@@ -59,8 +57,6 @@ jobs:
         with:
           token: ${{ secrets.token }}
           action: tag
-          baseurl: "https://hub.threefold.me"
-          backend: "hub.threefold.me:9980"
           user: tf-autobuilder
           name: ${{ steps.tag.outputs.reference }}/${{ inputs.package }}.flist
           target: tf-autobuilder/${{ steps.package.outputs.name }}.flist

.github/workflows/bin-package-no-tag.yaml

@@ -37,8 +37,6 @@ jobs:
         with:
           token: ${{ secrets.token }}
           action: publish
-          baseurl: "https://hub.threefold.me"
-          backend: "hub.threefold.me:9980"
           user: tf-autobuilder
           root: bins/releases/${{ inputs.package }}
           name: ${{ steps.package.outputs.name }}.flist

.github/workflows/bin-package.yaml

@@ -54,27 +54,21 @@ jobs:
         run: |
           cd bins
           ./bins-extra.sh --package ${{ inputs.package }}
-
       - name: Publish flist (tf-autobuilder, ${{ steps.package.outputs.name }})
         if: success() && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/testdeploy' || startsWith(github.ref, 'refs/tags/v'))
         uses: threefoldtech/publish-flist@master
         with:
           token: ${{ secrets.token }}
           action: publish
-          baseurl: "https://hub.threefold.me"
-          backend: "hub.threefold.me:9980"
           user: tf-autobuilder
           root: bins/releases/${{ inputs.package }}
           name: ${{ steps.package.outputs.name }}.flist
-
       - name: Tagging
         uses: threefoldtech/publish-flist@master
         if: success() && (github.ref == 'refs/heads/main'  || github.ref == 'refs/heads/testdeploy'|| startsWith(github.ref, 'refs/tags/v'))
         with:
           token: ${{ secrets.token }}
           action: tag
-          baseurl: "https://hub.threefold.me"
-          backend: "hub.threefold.me:9980"
           user: tf-autobuilder
           name: ${{ steps.tag.outputs.reference }}/${{ inputs.package }}.flist
           target: tf-autobuilder/${{ steps.package.outputs.name }}.flist

.github/workflows/grid-deploy.yaml

@@ -26,8 +26,6 @@ jobs:
         with:
           token: ${{ secrets.HUB_JWT }}
           action: crosslink
-          baseurl: "https://hub.threefold.me"
-          backend: "hub.threefold.me:9980"
           user: tf-zos
           name: zos:${{ github.event.inputs.grid }}-3:latest.flist
           target: tf-autobuilder/zos:${{ github.event.inputs.version }}.flist

.github/workflows/publish-bootstrap.yaml

@@ -40,8 +40,6 @@ jobs:
           root: archive
           token: ${{ secrets.HUB_JWT }}
           name: ${{ steps.setname.outputs.build }}
-          baseurl: "https://hub.threefold.me"
-          backend: "hub.threefold.me:9980"
       - name: Symlink flist (development)
         if: success()
         uses: threefoldtech/publish-flist@master
@@ -51,8 +49,6 @@ jobs:
           token: ${{ secrets.HUB_JWT }}
           name: ${{ steps.setname.outputs.build }}
           target: bootstrap:development.flist
-          baseurl: "https://hub.threefold.me"
-          backend: "hub.threefold.me:9980"
       - name: Symlink flist (release)
         if: success() && github.ref == 'refs/heads/main'
         uses: threefoldtech/publish-flist@master
@@ -62,5 +58,3 @@ jobs:
           token: ${{ secrets.HUB_JWT }}
           name: ${{ steps.setname.outputs.build }}
           target: bootstrap:latest.flist
-          baseurl: "https://hub.threefold.me"
-          backend: "hub.threefold.me:9980"

.github/workflows/publish.yaml

@@ -64,8 +64,6 @@ jobs:
           user: tf-autobuilder
           root: archive
           name: zos:${{ steps.version.outputs.version }}.flist
-          baseurl: "https://hub.threefold.me"
-          backend: "hub.threefold.me:9980"
 
       # we tag only if and only if we merged to main
       # in that case the tag will be the short sha.
@@ -80,8 +78,6 @@ jobs:
           user: tf-autobuilder
           name: ${{ steps.tag.outputs.reference }}/zos.flist
           target: tf-autobuilder/zos:${{ steps.version.outputs.version }}.flist
-          baseurl: "https://hub.threefold.me"
-          backend: "hub.threefold.me:9980"
 
       # only for main branch (devnet)
       # this basically releases this build to devnet
@@ -94,5 +90,3 @@ jobs:
           user: tf-zos
           name: development
           target: tf-autobuilder/${{ steps.tag.outputs.reference }}
-          baseurl: "https://hub.threefold.me"
-          backend: "hub.threefold.me:9980"

bootstrap/bootstrap/src/zfs.rs

@@ -20,8 +20,6 @@ impl Zfs {
 
         let mut child = Command::new("g8ufs")
             .arg("--ro")
-            .arg("--storage-url")
-            .arg("redis://hub.threefold.me:9900")
             .arg("--cache")
             .arg(backend.as_ref())
             .arg("--meta")

cmds/internet/main.go

@@ -95,7 +95,7 @@ func check() error {
 
 		// we only care about possibility of establishing a connection
 		// so just establishing a connection then close it is good enough
-		for _, address := range []string{"bootstrap.threefold.me:http", "hub.threefold.me:http"} {
+		for _, address := range []string{"bootstrap.grid.tf:http", "hub.grid.tf:http"} {
 			log.Info().Str("trying out address", address).Msg("testing internet connection.")
 			con, err := net.Dial("tcp", address)
 			if err != nil {

cmds/modules/api_gateway/main.go

@@ -97,7 +97,6 @@ func action(cli *cli.Context) error {
 		}
 	}()
 
-	// no need to restart zos-api here as it only tries to get farm and twin, donesn't mentain any open connections
 	api, err := zosapi.NewZosAPI(manager, redis, msgBrokerCon)
 	if err != nil {
 		return fmt.Errorf("failed to create zos api: %w", err)
@@ -112,6 +111,7 @@ func action(cli *cli.Context) error {
 	bo := backoff.NewExponentialBackOff()
 	bo.MaxElapsedTime = 0
 
+    // this peer is used to allow the node to restart the peer without the need to cancel the module context
 	peerCtx, cancel := context.WithCancel(ctx)
 	defer cancel()
 

qemu/Makefile

@@ -8,7 +8,7 @@ zinit:
 
 kernel:
 	@echo "Download 0-OS kernel"
-	wget https://bootstrap.threefold.me/kernel/net/dev.efi
+	wget https://bootstrap.grid.tf/kernel/net/dev.efi
 
 start:
 	bash vm.sh -n node1 -c "runmode=dev farmer_id=$(FARMERID)"