diff --git a/Dockerfile b/Dockerfile index 0dee9f4cf5e5e17aad65ae9d270cf4ce28f7513b..4400a85c514ff29c2266f061304aaf4442eaac0d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -ARG GITLAB_VERSION=v13.2.0-ubi8 +ARG GITLAB_VERSION=v13.2.6-ubi8 ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082 ARG BASE_IMAGE=gitlab/gitlab/gitlab-rails -ARG BASE_TAG=13.2.0 +ARG BASE_TAG=13.2.6 ARG RAILS_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} diff --git a/Jenkinsfile b/Jenkinsfile index 68393cd098a081c8923daddab16ee951bb6f5474..36a29404043b494e6b559d6ba9f43dddae88284b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,2 +1,2 @@ @Library('DCCSCR@master') _ -dccscrPipeline(version: "13.2.0") +dccscrPipeline(version: "13.2.6") diff --git a/build-scripts/build.sh b/build-scripts/build.sh index a8cf2ee571575e5d00ff4e0d9f8636e8749ebbfa..ff4b98b0a64fe8221461360f52c3f5740ced2cf5 100755 --- a/build-scripts/build.sh +++ b/build-scripts/build.sh @@ -4,7 +4,7 @@ set -euxo pipefail -TAG=${1:-13.2.0} +TAG=${1:-13.2.6} REPOSITORY=${2:-} DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/download.yaml b/download.yaml index ba3e85c866c43e44ecdae8bb6621d5f67b0c9c95..54d312aa8664e6466a9c3da82a3bc79bdb7933d5 100644 --- a/download.yaml +++ b/download.yaml @@ -1,11 +1,11 @@ resources: - - url: "http://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.2.0-ubi8/gitlab-task-runner-ee.tar.gz" + - url: "http://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.2.6-ubi8/gitlab-task-runner-ee.tar.gz" filename: "gitlab-task-runner-ee.tar.gz" validation: type: "sha256" - value: "ed7a08756e6c81546ac62bd8f64022d15fac6e2d5ae263e4bbfec36a94a0e564" - - url: "http://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.2.0-ubi8/gitlab-python.tar.gz" + value: "ece65686b4ec4bdc6506b569a9af77b8fa17e7a3463c3cae13ce95e84ebad5fc" + - url: "http://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.2.6-ubi8/gitlab-python.tar.gz" filename: "gitlab-python.tar.gz" validation: type: "sha256" - value: "de90479c921f72b62b7fc2ad3d203f64eee3c47027aca44547a5e1350b633686" + value: "df96fd3d2f0acef9edfdf1b8843deb754a6713fc2009270563f671dc0f907628" diff --git a/scripts/lib/object_storage_backup.rb b/scripts/lib/object_storage_backup.rb index fd8dae6361cef6b7e6477d9bd9e565d8f95c4f07..67a78a45ecc968d929d6c7a2fe2050020b9cd21c 100644 --- a/scripts/lib/object_storage_backup.rb +++ b/scripts/lib/object_storage_backup.rb @@ -73,11 +73,11 @@ class ObjectStorageBackup end def upload_to_object_storage(source_path) + dir_name = File.basename(source_path) if @backend == "s3" - dir_name = File.basename(source_path) cmd = %W(s3cmd --stop-on-error sync #{source_path}/ s3://#{@remote_bucket_name}/#{dir_name}/) elsif @backend == "gcs" - cmd = %W(gsutil -m rsync -r #{source_path}/ gs://#{@remote_bucket_name}) + cmd = %W(gsutil -m rsync -r #{source_path}/ gs://#{@remote_bucket_name}/#{dir_name}) end output, status = run_cmd(cmd)