ci: migrate semaphore YAMLs to use Ubuntu 24.04

.semaphore/release.yml

@@ -2,8 +2,8 @@ version: "v1.0"
 name: Release
 agent:
   machine:
-    type: e1-standard-4
-    os_image: ubuntu2004
+    type: f1-standard-2
+    os_image: ubuntu2404
 blocks:
   - name: "Release"
     task:

.semaphore/semaphore.yml

@@ -2,15 +2,11 @@ version: v1.0
 name: Agent
 agent:
   machine:
-    type: e1-standard-2
-    os_image: ubuntu2004
+    type: f1-standard-2
+    os_image: ubuntu2404
 
 execution_time_limit:
-  minutes: 15
-
-fail_fast:
-  stop:
-    when: true
+  minutes: 10
 
 blocks:
   - name: "Lint"
@@ -22,7 +18,7 @@ blocks:
 
       prologue:
         commands:
-          - sem-version go 1.23.8
+          - sem-version go 1.24.11
           - checkout
 
       jobs:
@@ -41,7 +37,7 @@ blocks:
           - checkout
           - mv ~/.ssh/security-toolbox ~/.ssh/id_rsa
           - sudo chmod 600 ~/.ssh/id_rsa
-          - sem-version go 1.23.8
+          - sem-version go 1.24.11
       jobs:
         - name: Check dependencies
           commands:
@@ -67,7 +63,7 @@ blocks:
 
       prologue:
         commands:
-          - sem-version go 1.23.8
+          - sem-version go 1.24.11
           - checkout
           - go version
           - go get
@@ -100,7 +96,7 @@ blocks:
 
       prologue:
         commands:
-          - sem-version go 1.23.8
+          - sem-version go 1.24.11
           - checkout
           - go version
           - go get
@@ -167,7 +163,7 @@ blocks:
 
       prologue:
         commands:
-          - sem-version go 1.23.8
+          - sem-version go 1.24.11
           - checkout
           - go version
           - go get
@@ -204,7 +200,7 @@ blocks:
 
       prologue:
         commands:
-          - sem-version go 1.23.8
+          - sem-version go 1.24.11
           - checkout
           - go version
           - go get
@@ -245,7 +241,7 @@ blocks:
 
       prologue:
         commands:
-          - sem-version go 1.23.8
+          - sem-version go 1.24.11
           - curl -sLO https://storage.googleapis.com/minikube/releases/latest/minikube-linux-amd64 && install minikube-linux-amd64 /tmp/
           - /tmp/minikube-linux-amd64 config set WantUpdateNotification false
           - /tmp/minikube-linux-amd64 start --driver=docker

Dockerfile.self_hosted

@@ -8,7 +8,7 @@ ARG USER_GID=$USER_UID
 RUN groupadd --gid $USER_GID $USERNAME && \
   useradd --uid $USER_UID --gid $USER_GID -m $USERNAME
 
-RUN apt-get update -y && apt-get install -y --no-install-recommends ca-certificates curl
+RUN apt-get update -y && apt-get upgrade -y && apt-get install -y --no-install-recommends ca-certificates curl
 RUN update-ca-certificates
 
 # kubectl is required to be present in the container running the agent

Dockerfile.test

@@ -4,6 +4,9 @@ RUN apt-get update && \
   apt-get install curl -y && \
   curl -sSL https://get.docker.com/ | sh && \
   apt-get install -y ssh docker-compose-plugin && \
+  # Install standalone docker-compose for backward compatibility
+  curl -L "https://github.com/docker/compose/releases/latest/download/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose && \
+  chmod +x /usr/local/bin/docker-compose && \
   # pin pyyaml to 5.3.1 until https://github.com/yaml/pyyaml/issues/724 is fixed
   pip install pyyaml==5.3.1 && \
   pip install awscli
@@ -29,4 +32,4 @@ ADD build/agent /app/agent
 
 WORKDIR /app
 
-CMD service ssh restart && ./agent serve --port 30000
+CMD ["sh", "-c", "service ssh restart && ./agent serve --port 30000"]

pkg/api/job_request.go

@@ -1,4 +1,4 @@
-package api
+package agentapi
 
 import (
 	"encoding/base64"

pkg/api/job_request_test.go

@@ -1,4 +1,4 @@
-package api
+package agentapi
 
 import (
 	"encoding/base64"

pkg/aws/aws.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 
 	versions "github.com/hashicorp/go-version"
-	"github.com/semaphoreci/agent/pkg/api"
+	api "github.com/semaphoreci/agent/pkg/api"
 	log "github.com/sirupsen/logrus"
 )
 

pkg/docker/docker.go

@@ -7,7 +7,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/semaphoreci/agent/pkg/api"
+	api "github.com/semaphoreci/agent/pkg/api"
 	"github.com/semaphoreci/agent/pkg/aws"
 )
 

pkg/docker/docker_test.go

@@ -5,7 +5,7 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/semaphoreci/agent/pkg/api"
+	api "github.com/semaphoreci/agent/pkg/api"
 	"github.com/stretchr/testify/assert"
 )
 

pkg/eventlogger/default.go

@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/semaphoreci/agent/pkg/api"
+	api "github.com/semaphoreci/agent/pkg/api"
 )
 
 const LoggerMethodPull = "pull"

pkg/executors/shell_executor_test.go

@@ -410,7 +410,7 @@ func Test__ShellExecutor__BrokenUnicode(t *testing.T) {
 
 	assert.Equal(t, simplifiedEvents, []string{
 		fmt.Sprintf("directive: %s", testsupport.EchoBrokenUnicode()),
-		"\x96\x96\x96\x96\x96",
+		"\u0096\u0096\u0096\u0096\u0096",
 		"Exit Code: 0",
 	})
 }

pkg/jobs/job_test.go

@@ -12,7 +12,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/semaphoreci/agent/pkg/api"
+	api "github.com/semaphoreci/agent/pkg/api"
 	"github.com/semaphoreci/agent/pkg/config"
 	eventlogger "github.com/semaphoreci/agent/pkg/eventlogger"
 	testsupport "github.com/semaphoreci/agent/test/support"

pkg/kubernetes/client.go

@@ -11,7 +11,7 @@ import (
 	"time"
 
 	"github.com/ghodss/yaml"
-	"github.com/semaphoreci/agent/pkg/api"
+	api "github.com/semaphoreci/agent/pkg/api"
 	"github.com/semaphoreci/agent/pkg/config"
 	"github.com/semaphoreci/agent/pkg/docker"
 	"github.com/semaphoreci/agent/pkg/retry"

pkg/kubernetes/client_test.go

@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/semaphoreci/agent/pkg/api"
+	api "github.com/semaphoreci/agent/pkg/api"
 	assert "github.com/stretchr/testify/assert"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"

pkg/kubernetes/image_validator.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"regexp"
 
-	"github.com/semaphoreci/agent/pkg/api"
+	api "github.com/semaphoreci/agent/pkg/api"
 )
 
 type ImageValidator struct {

pkg/kubernetes/image_validator_test.go

@@ -3,7 +3,7 @@ package kubernetes
 import (
 	"testing"
 
-	"github.com/semaphoreci/agent/pkg/api"
+	api "github.com/semaphoreci/agent/pkg/api"
 	"github.com/stretchr/testify/assert"
 )
 

pkg/listener/job_processor.go

@@ -11,7 +11,7 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/semaphoreci/agent/pkg/api"
+	api "github.com/semaphoreci/agent/pkg/api"
 	"github.com/semaphoreci/agent/pkg/config"
 	jobs "github.com/semaphoreci/agent/pkg/jobs"
 	"github.com/semaphoreci/agent/pkg/kubernetes"

pkg/listener/listener_test.go

@@ -10,7 +10,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/semaphoreci/agent/pkg/api"
+	api "github.com/semaphoreci/agent/pkg/api"
 	"github.com/semaphoreci/agent/pkg/config"
 	"github.com/semaphoreci/agent/pkg/eventlogger"
 	"github.com/semaphoreci/agent/pkg/listener/selfhostedapi"

pkg/listener/selfhostedapi/get_job.go

@@ -6,7 +6,7 @@ import (
 	"io/ioutil"
 	"net/http"
 
-	"github.com/semaphoreci/agent/pkg/api"
+	api "github.com/semaphoreci/agent/pkg/api"
 )
 
 func (a *API) GetJobPath(jobID string) string {

pkg/server/server_test.go

@@ -11,7 +11,7 @@ import (
 	"time"
 
 	"github.com/golang-jwt/jwt/v4"
-	"github.com/semaphoreci/agent/pkg/api"
+	api "github.com/semaphoreci/agent/pkg/api"
 	"github.com/stretchr/testify/assert"
 )
 

pkg/shell/env.go

@@ -8,7 +8,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/semaphoreci/agent/pkg/api"
+	api "github.com/semaphoreci/agent/pkg/api"
 	"github.com/semaphoreci/agent/pkg/config"
 )
 

pkg/shell/env_test.go

@@ -7,7 +7,7 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/semaphoreci/agent/pkg/api"
+	api "github.com/semaphoreci/agent/pkg/api"
 	"github.com/semaphoreci/agent/pkg/config"
 	"github.com/stretchr/testify/assert"
 )

test/e2e_support/listener_mode.rb

@@ -6,9 +6,9 @@ class ListenerMode
 
   def boot_up_agent
     File.write("/tmp/agent/config.yaml", $AGENT_CONFIG.to_yaml)
-    system "docker-compose -f test/e2e_support/docker-compose-listen.yml stop"
-    system "docker-compose -f test/e2e_support/docker-compose-listen.yml build"
-    system "docker-compose -f test/e2e_support/docker-compose-listen.yml up -d"
+    system "docker compose -f test/e2e_support/docker-compose-listen.yml stop"
+    system "docker compose -f test/e2e_support/docker-compose-listen.yml build"
+    system "docker compose -f test/e2e_support/docker-compose-listen.yml up -d"
 
     wait_for_agent_to_register_in_the_hub
   end

test/hub_reference/Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.7
+FROM ruby:3.3
 
 WORKDIR /app
 

test/hub_reference/Gemfile

@@ -1,4 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'sinatra'
+gem 'sinatra', '>= 4.2.0'
 gem 'thin'
+gem 'rackup'
+gem 'puma'

test/hub_reference/Gemfile.lock

@@ -1,31 +1,41 @@
 GEM
   remote: https://rubygems.org/
   specs:
+    base64 (0.3.0)
     daemons (1.4.1)
     eventmachine (1.2.7)
-    mustermann (3.0.0)
+    logger (1.7.0)
+    mustermann (3.0.4)
       ruby2_keywords (~> 0.0.1)
-    rack (2.2.20)
-    rack-protection (3.0.4)
-      rack
+    rack (3.2.4)
+    rack-protection (4.2.1)
+      base64 (>= 0.1.0)
+      logger (>= 1.6.0)
+      rack (>= 3.0.0, < 4)
+    rack-session (2.1.1)
+      base64 (>= 0.1.0)
+      rack (>= 3.0.0)
     ruby2_keywords (0.0.5)
-    sinatra (3.0.4)
+    sinatra (4.2.1)
+      logger (>= 1.6.0)
       mustermann (~> 3.0)
-      rack (~> 2.2, >= 2.2.4)
-      rack-protection (= 3.0.4)
+      rack (>= 3.0.0, < 4)
+      rack-protection (= 4.2.1)
+      rack-session (>= 2.0.0, < 3)
       tilt (~> 2.0)
-    thin (1.8.1)
+    thin (2.0.1)
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
-      rack (>= 1, < 3)
-    tilt (2.0.11)
+      logger
+      rack (>= 1, < 4)
+    tilt (2.6.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  sinatra
+  sinatra (>= 4.2.0)
   thin
 
 BUNDLED WITH
-   2.1.4
+   2.4.22

test/support/hub.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/semaphoreci/agent/pkg/api"
+	api "github.com/semaphoreci/agent/pkg/api"
 	"github.com/semaphoreci/agent/pkg/listener/selfhostedapi"
 	"github.com/semaphoreci/agent/pkg/retry"
 )