From 95303a1c25a0a4332f301f7fc21fd35c7fb28984 Mon Sep 17 00:00:00 2001
From: Volker Schukai <volker.schukai@schukai.com>
Date: Mon, 23 Oct 2023 11:55:26 +0200
Subject: [PATCH] fix: ci pipeline
---
.gitlab-ci.yml | 2 ++
devenv.nix | 2 ++
runnable-sftp_test.go | 3 ++-
3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 38e01b0..fc6addc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,8 +26,10 @@ stages:
before_script:
# - unset DOCKER_TLS_VERIFY
+ - nix shell nixpkgs#coreutils -c ls -lah /certs/client/
- nix shell nixpkgs#coreutils -c mkdir -p /certs/client/
- nix shell nixpkgs#coreutils -c ln -fs /etc/ssl/certs/ca-bundle.crt /certs/client/ca.pem
+ - nix shell nixpkgs#coreutils -c ls -lah /certs/client/
- echo > .env-gitlab-ci
- variables=("HOME=$HOME" "CI_COMMIT_REF_NAME=$CI_COMMIT_REF_NAME" "CI_REPOSITORY_URL=$CI_REPOSITORY_URL" "GITLAB_TOKEN=$GITLAB_TOKEN" "CI_JOB_TOKEN=$CI_JOB_TOKEN" "GITLAB_USER_EMAIL=$GITLAB_USER_EMAIL" "GITLAB_USER_NAME=\"$GITLAB_USER_NAME\"" "CI_REGISTRY_USER=$CI_REGISTRY_USER" "CI_PROJECT_ID=$CI_PROJECT_ID" "CI_PROJECT_DIR=$CI_PROJECT_DIR" "CI_API_V4_URL=$CI_API_V4_URL" "CI_PROJECT_NAME=$CI_PROJECT_NAME" "CI_COMMIT_SHORT_SHA=$CI_COMMIT_SHORT_SHA"); for var in "${variables[@]}"; do echo "$var" >> .env-gitlab-ci; done
- cat .env-gitlab-ci
diff --git a/devenv.nix b/devenv.nix
index 4fb5ef3..52e632e 100644
--- a/devenv.nix
+++ b/devenv.nix
@@ -325,8 +325,10 @@ stages:
before_script:
# - unset DOCKER_TLS_VERIFY
+ - nix shell nixpkgs#coreutils -c ls -lah /certs/client/
- nix shell nixpkgs#coreutils -c mkdir -p /certs/client/
- nix shell nixpkgs#coreutils -c ln -fs /etc/ssl/certs/ca-bundle.crt /certs/client/ca.pem
+ - nix shell nixpkgs#coreutils -c ls -lah /certs/client/
- echo > .env-gitlab-ci
- variables=("HOME=$HOME" "CI_COMMIT_REF_NAME=$CI_COMMIT_REF_NAME" "CI_REPOSITORY_URL=$CI_REPOSITORY_URL" "GITLAB_TOKEN=$GITLAB_TOKEN" "CI_JOB_TOKEN=$CI_JOB_TOKEN" "GITLAB_USER_EMAIL=$GITLAB_USER_EMAIL" "GITLAB_USER_NAME=\"$GITLAB_USER_NAME\"" "CI_REGISTRY_USER=$CI_REGISTRY_USER" "CI_PROJECT_ID=$CI_PROJECT_ID" "CI_PROJECT_DIR=$CI_PROJECT_DIR" "CI_API_V4_URL=$CI_API_V4_URL" "CI_PROJECT_NAME=$CI_PROJECT_NAME" "CI_COMMIT_SHORT_SHA=$CI_COMMIT_SHORT_SHA"); for var in "''${variables[@]}"; do echo "$var" >> .env-gitlab-ci; done
- cat .env-gitlab-ci
diff --git a/runnable-sftp_test.go b/runnable-sftp_test.go
index d0ac05b..0f0c999 100644
--- a/runnable-sftp_test.go
+++ b/runnable-sftp_test.go
@@ -8,6 +8,7 @@ import (
"github.com/docker/docker/client"
"github.com/docker/go-connections/nat"
"github.com/stretchr/testify/assert"
+ "io"
"net"
"os"
"testing"
@@ -30,7 +31,7 @@ func startSFTPTestDockerImageAndContainer(t *testing.T, host string, port string
}
//if debug image pull, comment out the following lines
- //_, _ = io.Copy(os.Stdout, reader)
+ _, _ = io.Copy(os.Stdout, reader)
_ = reader
hostConfig := &container.HostConfig{
--
GitLab