New bootstrap (#1398)

* fix bootstrap to support booting v3

* modify all builds to automate for v3

.github/workflows/publish-bootstrap.yaml

@@ -2,8 +2,8 @@ name: Publish Bootstrap
 on:
   push:
     paths:
-      - 'bootstrap/bootstrap/**'
-      - '.github/workflows/publish-bootstrap.yaml'
+      - "bootstrap/bootstrap/**"
+      - ".github/workflows/publish-bootstrap.yaml"
 
 jobs:
   bootstrap:
@@ -53,7 +53,7 @@ jobs:
           name: ${{ steps.setname.outputs.build }}
           target: bootstrap:development.flist
       - name: Symlink flist (release)
-        if: success() && github.ref == 'refs/heads/master'
+        if: success() && github.ref == 'refs/heads/main'
         uses: threefoldtech/publish-flist@master
         with:
           action: symlink

.github/workflows/publish-development.yaml

@@ -56,7 +56,7 @@ jobs:
           target: ${{ steps.setname.outputs.build }}
 
       - name: Crosslink flist (development)
-        if: success() && github.ref == 'refs/heads/master-3'
+        if: success() && github.ref == 'refs/heads/main'
         uses: threefoldtech/publish-flist@master
         with:
           token: ${{ secrets.HUB_JWT }}

.github/workflows/publish-pre-release.yaml

@@ -66,7 +66,7 @@ jobs:
           token: ${{ secrets.HUB_JWT }}
           action: crosslink
           user: tf-zos
-          name: zos:development:latest.flist
+          name: zos:development-3:latest.flist
           target: tf-autobuilder/zos:${{ github.ref }}.flist
 
       - name: Symlink flist (testing)
@@ -76,5 +76,5 @@ jobs:
           token: ${{ secrets.HUB_JWT }}
           action: crosslink
           user: tf-zos
-          name: zos:testing:latest.flist
+          name: zos:testing-3:latest.flist
           target: tf-autobuilder/zos:${{ github.ref }}.flist

.github/workflows/publish-release.yaml

@@ -67,7 +67,7 @@ jobs:
           token: ${{ secrets.HUB_JWT }}
           action: crosslink
           user: tf-zos
-          name: zos:development:latest.flist
+          name: zos:development-3:latest.flist
           target: tf-autobuilder/zos:${{ github.ref }}.flist
 
       - name: Symlink flist (testing)
@@ -77,7 +77,7 @@ jobs:
           token: ${{ secrets.HUB_JWT }}
           action: crosslink
           user: tf-zos
-          name: zos:testing:latest.flist
+          name: zos:testing-3:latest.flist
           target: tf-autobuilder/zos:${{ github.ref }}.flist
 
       - name: Symlink flist (production)
@@ -87,5 +87,5 @@ jobs:
           token: ${{ secrets.HUB_JWT }}
           action: crosslink
           user: tf-zos
-          name: zos:production:latest.flist
+          name: zos:production-3:latest.flist
           target: tf-autobuilder/zos:${{ github.ref }}.flist

bootstrap/bootstrap/src/bootstrap.rs

@@ -8,7 +8,9 @@ use config::{RunMode, Version};
 use retry;
 
 const FLIST_REPO: &str = "tf-zos";
-const BIN_REPO: &str = "tf-zos-bins";
+const BIN_REPO_V2: &str = "tf-zos-bins";
+const BIN_REPO_V3: &str = "tf-zos-v3-bins";
+
 const FLIST_INFO_FILE: &str = "/tmp/flist.info";
 const FLIST_NAME_FILE: &str = "/tmp/flist.name";
 const WORKDIR: &str = "/tmp/bootstrap";
@@ -128,21 +130,26 @@ pub fn install(cfg: &config::Config) -> Result<()> {
 }
 
 fn install_packages(cfg: &config::Config) -> Result<()> {
+    let name = match cfg.version {
+        Version::V2 => BIN_REPO_V2,
+        Version::V3 => BIN_REPO_V3,
+    };
+
     let repo = match cfg.runmode {
-        config::RunMode::Prod => BIN_REPO.to_owned(),
-        config::RunMode::Dev => format!("{}.dev", BIN_REPO),
-        config::RunMode::Test => format!("{}.test", BIN_REPO),
+        config::RunMode::Prod => name.into(),
+        config::RunMode::Dev => format!("{}.dev", name),
+        config::RunMode::Test => format!("{}.test", name),
     };
 
     let client = hub::Repo::new(&repo);
     let packages = retry::retry(retry::delay::Exponential::from_millis(200), || {
-        info!("list packages in: {}", BIN_REPO);
+        info!("list packages in: {}", BIN_REPO_V2);
         //the full point of this match is the logging.
         let packages = match client.list() {
             Ok(info) => info,
             Err(err) => {
-                error!("failed to list repo '{}': {}", BIN_REPO, err);
-                bail!("failed to list repo '{}': {}", BIN_REPO, err);
+                error!("failed to list repo '{}': {}", BIN_REPO_V2, err);
+                bail!("failed to list repo '{}': {}", BIN_REPO_V2, err);
             }
         };
 
@@ -151,7 +158,7 @@ fn install_packages(cfg: &config::Config) -> Result<()> {
 
     let packages = match packages {
         Ok(packages) => packages,
-        Err(err) => bail!("failed to list '{}': {:?}", BIN_REPO, err),
+        Err(err) => bail!("failed to list '{}': {:?}", BIN_REPO_V2, err),
     };
 
     let mut map = std::collections::HashMap::new();

bootstrap/etc/zinit/internet.yaml

@@ -1,4 +1,5 @@
 exec: internet
 oneshot: true
+log: stdout
 after:
   - udev-trigger

pkg/environment/environment.go

@@ -67,23 +67,23 @@ var (
 		RunningMode:  RunningDev,
 		SubstrateURL: SubstrateDefaultURL,
 		FlistURL:     "zdb://hub.grid.tf:9900",
-		BinRepo:      "tf-zos-bins.dev",
+		BinRepo:      "tf-zos-v3-bins.dev",
 	}
 
 	envTest = Environment{
 		RunningMode: RunningTest,
 		// TODO: this should become a different substrate ?
 		SubstrateURL: SubstrateDefaultURL,
 		FlistURL:     "zdb://hub.grid.tf:9900",
-		BinRepo:      "tf-zos-bins.test",
+		BinRepo:      "tf-zos-v3-bins.test",
 	}
 
 	// same as testnet for now. will be updated the day of the launch of production network
 	envProd = Environment{
 		RunningMode:  RunningMain,
 		SubstrateURL: SubstrateDefaultURL,
 		FlistURL:     "zdb://hub.grid.tf:9900",
-		BinRepo:      "tf-zos-bins",
+		BinRepo:      "tf-zos-v3-bins",
 	}
 )
 

qemu/overlay/etc/zinit/bootstrap.yaml

@@ -1,6 +1,6 @@
 # Override the default bootstrap procedure
 # embedded in the image if using overlay
-exec: "true"
+exec: /sbin/bootstrap -d 
 oneshot: true
 after:
   - internet