address comments

Signed-off-by: Justin Alvarez <alvajus@amazon.com>
runfinch · Sep 18, 2024 · dd962aa · dd962aa
1 parent d648225
commit dd962aa
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 28 deletions.
diff --git a/.github/workflows/e2e-linux.yaml b/.github/workflows/e2e-linux.yaml
@@ -47,9 +47,6 @@ jobs:
       - name: Check repo out manually
         if: ${{ (startsWith(inputs.os, 'amazon') && inputs.version == '2' ) }}
         run: |
-          pwd
-          echo "${GITHUB_WORKSPACE}"
-          ls -lah
           git clone https://github.com/${GITHUB_REPOSITORY}.git .
           git config --add remote.origin.fetch "+refs/pull/*/head:refs/remotes/origin/prh/*"
           git config --add remote.origin.fetch "+refs/pull/*/merge:refs/remotes/origin/prm/*"
@@ -75,10 +72,11 @@ jobs:
           sudo systemctl stop finch-buildkit.service || true
           sudo systemctl stop finch-soci.service || true
           sudo sudo rpm -e runfinch-finch || true
+          sudo systemctl stop containerd.service
           sudo systemctl daemon-reload
           sudo rm -rf /etc/finch
           sudo rm -rf /var/finch
-          sudo rm -rf /var/containerd
+          sudo rm -rf /var/lib/containerd
           sudo rm -rf /var/soci-snapshotter
           sudo rm -rf ./_output
       - name: Build project
@@ -88,6 +86,7 @@ jobs:
         run: |
           sudo rpm -i ./_output/packages/$(ls -t ./_output/packages/ | grep runfinch-finch | head -1)
           sudo systemctl daemon-reload
+          sudo systemctl start containerd.service
           sudo systemctl start finch.service
           sudo systemctl start finch-buildkit.service
           sudo systemctl start finch-soci.service

diff --git a/contrib/packaging/rpm/finch.spec b/contrib/packaging/rpm/finch.spec
@@ -234,32 +234,14 @@ fi
 # nerdctl
 %{_libexecdir}/finch/nerdctl
 
-%pre
-# Stop the agent before the upgrade
-STATUS="$(systemctl is-active --quiet finch.service)"
-if [ "${STATUS}" = "active" ]; then
-  systemctl stop finch.service
-  systemctl daemon-reload
-fi
+%post
+%systemd_post finch
 
 %preun
-# Stop the agent after uninstall
-STATUS="$(systemctl is-active --quiet finch.service)"
-if [ "${STATUS}" = "active" ]; then
-  systemctl stop finch.service
-  systemctl daemon-reload
-fi
-ENABLED="$(systemctl is-enabled --quiet finch.service)"
-if [ "${ENABLED}" = "enabled" ]; then
-  systemctl disable finch.service
-fi
-systemctl daemon-reload
+%systemd_preun finch
 
-%posttrans
-# Start the agent after initial install or upgrade
-systemctl enable finch.service
-systemctl start finch.service
-systemctl daemon-reload
+%postun
+%systemd_postun_with_restart finch
 
 %changelog
 * Fri Jul 26 2024 Justin Alvarez <alvajus@amazon.com> - 

diff --git a/e2e/container/container_test.go b/e2e/container/container_test.go
@@ -68,7 +68,7 @@ func TestContainer(t *testing.T) {
 			tests.Run(&tests.RunOption{BaseOpt: o, CGMode: tests.Hybrid, DefaultHostGatewayIP: hostIP})
 		case "darwin":
 			tests.Run(&tests.RunOption{BaseOpt: o, CGMode: tests.Unified, DefaultHostGatewayIP: "192.168.5.2"})
-		default:
+		case "linux":
 			fmt.Printf("getCGroupMode(): %d\n", getCGroupMode())
 			tests.Run(&tests.RunOption{BaseOpt: o, CGMode: getCGroupMode(), DefaultHostGatewayIP: ncdefaults.HostGatewayIP()})
 		}