Update SELinux golang version (#326)

Mirantis · Mar 8, 2024 · bec33b1 · bec33b1
1 parent 178ed78
commit bec33b1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -184,10 +184,10 @@ jobs:
         run: |
           limactl start --name=default --plain template://rocky-8
           mkdir -p -m 0700 ~/.ssh
-          cat ~/.lima/default/ssh.config >>~/.ssh/config
+          cat ~/.lima/default/ssh.config >> ~/.ssh/config
 
       - run: rsync -a -e ssh src/github.com/Mirantis/cri-dockerd/ lima-default:/tmp/cri-dockerd
       - run: ssh lima-default sudo /tmp/cri-dockerd/scripts/setup-el
-      - run: ssh lima-default make -C /tmp/cri-dockerd cri-dockerd
+      - run: ssh lima-default "export PATH=$PATH:/usr/local/go/bin && make -C /tmp/cri-dockerd cri-dockerd"
       - run: ssh -f lima-default sudo /tmp/cri-dockerd/cri-dockerd --network-plugin="" &
       - run: ssh lima-default sudo /usr/local/bin/critest -runtime-endpoint=unix:///var/run/cri-dockerd.sock -ginkgo.focus='.*selinux.*' -ginkgo.v
diff --git a/scripts/setup-el b/scripts/setup-el
@@ -9,8 +9,15 @@ mkdir -p /etc/docker
 cat <<EOF >/etc/docker/daemon.json
 {"selinux-enabled": true}
 EOF
+
+echo "Installing Golang"
+curl -O https://dl.google.com/go/go1.22.1.linux-amd64.tar.gz
+sudo tar -C /usr/local -xzf go1.22.1.linux-amd64.tar.gz
+export PATH=$PATH:/usr/local/go/bin
+
+echo "Installing other dependencies"
 dnf config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo
-dnf install -y docker-ce git golang make
+dnf install -y docker-ce git make
 sudo systemctl enable --now docker
 
 echo "Installing cri-tools"