wip

Signed-off-by: Colin Walters <[email protected]>

.github/workflows/ci.yml

@@ -14,102 +14,106 @@ env:
   CARGO_TERM_COLOR: always
 
 jobs:
-  tests:
-    runs-on: ubuntu-latest
-    container: quay.io/coreos-assembler/fcos-buildroot:testing-devel
-    steps:
-      - uses: actions/checkout@v3
-      - name: Install deps
-        run: ./ci/installdeps.sh
-      # xref containers/containers-image-proxy-rs
-      - name: Cache Dependencies
-        uses: Swatinem/rust-cache@v2
-        with:
-          key: "tests"
-      - name: cargo fmt (check)
-        run: cargo fmt -- --check -l
-      - name: Build
-        run: cargo test --no-run
-      - name: Build lib without default features
-        run: cd lib && cargo check --no-default-features
-      - name: Individual checks
-        run: (cd cli && cargo check) && (cd lib && cargo check)
-      - name: Lints
-        run: cargo xtask custom-lints
-      - name: Run tests
-        run: cargo test -- --nocapture --quiet
-      - name: Manpage generation
-        run: mkdir -p target/man && cargo run --features=docgen -- man --directory target/man
-      - name: Clippy (non-gating)
-        run: cargo clippy
-  build:
-    runs-on: ubuntu-latest
-    container: quay.io/coreos-assembler/fcos-buildroot:testing-devel
-    steps:
-      - uses: actions/checkout@v3
-      - name: Install deps
-        run: ./ci/installdeps.sh
-      - name: Cache Dependencies
-        uses: Swatinem/rust-cache@v2
-        with:
-          key: "build"
-      - name: Build
-        run: make test-bin-archive
-      - name: Upload binary
-        uses: actions/upload-artifact@v2
-        with:
-          name: bootc.tar.zst
-          path: target/bootc.tar.zst
-  cargo-deny:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - uses: EmbarkStudios/cargo-deny-action@v1
-      with:
-        log-level: warn
-        command: check bans sources licenses
-  privtest:
-    name: "Privileged testing"
-    needs: build
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-      - name: Download
-        uses: actions/download-artifact@v2
-        with:
-          name: bootc.tar.zst
-      - name: Install
-        run: sudo tar -C / -xvf bootc.tar.zst
-      - name: Integration tests
-        run: sudo podman run --rm -ti --privileged -v /run/systemd:/run/systemd -v /:/run/host -v /usr/bin/bootc:/usr/bin/bootc --pid=host quay.io/fedora/fedora-coreos:testing-devel bootc internal-tests run-privileged-integration
-  container-tests:
-    name: "Container testing"
-    needs: build
-    runs-on: ubuntu-latest
-    container: quay.io/fedora/fedora-coreos:testing-devel
-    steps:
-      - name: Download
-        uses: actions/download-artifact@v2
-        with:
-          name: bootc.tar.zst
-      - name: Install
-        run: sudo tar -C / -xvf bootc.tar.zst
-      - name: Integration tests
-        run: bootc internal-tests run-container-integration
+  # tests:
+  #   runs-on: ubuntu-latest
+  #   container: quay.io/coreos-assembler/fcos-buildroot:testing-devel
+  #   steps:
+  #     - uses: actions/checkout@v3
+  #     - name: Install deps
+  #       run: ./ci/installdeps.sh
+  #     # xref containers/containers-image-proxy-rs
+  #     - name: Cache Dependencies
+  #       uses: Swatinem/rust-cache@v2
+  #       with:
+  #         key: "tests"
+  #     - name: cargo fmt (check)
+  #       run: cargo fmt -- --check -l
+  #     - name: Build
+  #       run: cargo test --no-run
+  #     - name: Build lib without default features
+  #       run: cd lib && cargo check --no-default-features
+  #     - name: Individual checks
+  #       run: (cd cli && cargo check) && (cd lib && cargo check)
+  #     - name: Lints
+  #       run: cargo xtask custom-lints
+  #     - name: Run tests
+  #       run: cargo test -- --nocapture --quiet
+  #     - name: Manpage generation
+  #       run: mkdir -p target/man && cargo run --features=docgen -- man --directory target/man
+  #     - name: Clippy (non-gating)
+  #       run: cargo clippy
+  # build:
+  #   runs-on: ubuntu-latest
+  #   container: quay.io/coreos-assembler/fcos-buildroot:testing-devel
+  #   steps:
+  #     - uses: actions/checkout@v3
+  #     - name: Install deps
+  #       run: ./ci/installdeps.sh
+  #     - name: Cache Dependencies
+  #       uses: Swatinem/rust-cache@v2
+  #       with:
+  #         key: "build"
+  #     - name: Build
+  #       run: make test-bin-archive
+  #     - name: Upload binary
+  #       uses: actions/upload-artifact@v2
+  #       with:
+  #         name: bootc.tar.zst
+  #         path: target/bootc.tar.zst
+  # cargo-deny:
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #   - uses: actions/checkout@v3
+  #   - uses: EmbarkStudios/cargo-deny-action@v1
+  #     with:
+  #       log-level: warn
+  #       command: check bans sources licenses
+  # privtest:
+  #   name: "Privileged testing"
+  #   needs: build
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - name: Checkout repository
+  #       uses: actions/checkout@v3
+  #     - name: Download
+  #       uses: actions/download-artifact@v2
+  #       with:
+  #         name: bootc.tar.zst
+  #     - name: Install
+  #       run: sudo tar -C / -xvf bootc.tar.zst
+  #     - name: Integration tests
+  #       run: sudo podman run --rm -ti --privileged -v /run/systemd:/run/systemd -v /:/run/host -v /usr/bin/bootc:/usr/bin/bootc --pid=host quay.io/fedora/fedora-coreos:testing-devel bootc internal-tests run-privileged-integration
+  # container-tests:
+  #   name: "Container testing"
+  #   needs: build
+  #   runs-on: ubuntu-latest
+  #   container: quay.io/fedora/fedora-coreos:testing-devel
+  #   steps:
+  #     - name: Download
+  #       uses: actions/download-artifact@v2
+  #       with:
+  #         name: bootc.tar.zst
+  #     - name: Install
+  #       run: sudo tar -C / -xvf bootc.tar.zst
+  #     - name: Integration tests
+  #       run: bootc internal-tests run-container-integration
   privtest-alongside:
     name: "Test install-alongside"
-    needs: build
+#    needs: build
     runs-on: ubuntu-latest
     steps:
-      - name: Download
-        uses: actions/download-artifact@v2
-        with:
-          name: bootc.tar.zst
-      - name: Install
-        run: tar -xvf bootc.tar.zst
+      # - name: Download
+      #   uses: actions/download-artifact@v2
+      #   with:
+      #     name: bootc.tar.zst
+      # - name: Install
+      #   run: tar -xvf bootc.tar.zst
+      - name: Update host skopeo
+        run: |
+          echo 'deb http://cz.archive.ubuntu.com/ubuntu lunar main universe' | sudo tee -a /etc/apt/sources.list 
+          sudo apt upgrade skopeo
       - name: Integration tests
         run: |
-          sudo podman run --rm -ti --privileged -v /:/target -v bootc:/usr/bin/bootc --pid=host \
-            quay.io/fedora/fedora-coreos:testing-devel bootc install-to-filesystem --karg=foo=bar --disable-selinux --replace=alongside /target
+          sudo podman run --rm -ti --privileged -v /:/target --pid=host --security-opt label=disable \
+            registry.gitlab.com/centos/cloud/sagano/fedora-boot-tier-1-dev:eln bootc install-to-filesystem --karg=foo=bar --disable-selinux --replace=alongside /target
           sudo grep foo=bar /boot/loader/entries/*.conf