From f3fd5c2b5e4f89a5a1e2b936e8fc6a64b93b9f09 Mon Sep 17 00:00:00 2001 From: Felipe Pina Date: Wed, 13 May 2020 08:41:52 -0300 Subject: [PATCH 1/2] =?UTF-8?q?Corrigir=20gera=C3=A7=C3=A3o=20das=20imagen?= =?UTF-8?q?s=20Docker=20[SOMA-4525]=20+=20Altera=20de=20onde=20=C3=A9=20ob?= =?UTF-8?q?tida=20a=20vers=C3=A3o=20corrente=20do=20SGA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Docker/posix/Dockerfile | 10 +++++----- docker.gitlab-ci.yml | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Docker/posix/Dockerfile b/Docker/posix/Dockerfile index e6acdfa..6f712f7 100755 --- a/Docker/posix/Dockerfile +++ b/Docker/posix/Dockerfile @@ -2,7 +2,7 @@ FROM repo.tecgraf.puc-rio.br:18089/soma/ubuntu:16.04-sga-posix ENV LUA_VERSION 5.3.3 ENV LUAROCKS_VERSION 2.4.2 - +ARG TAG=master # RUN curl -L http://www.lua.org/ftp/lua-${LUA_VERSION}.tar.gz | tar xzf - && \ # cd /lua-$LUA_VERSION && \ # make linux test && \ @@ -17,11 +17,11 @@ RUN curl -L http://luarocks.github.io/luarocks/releases/luarocks-${LUAROCKS_VERS cd .. && rm -rf /lua-$LUAROCKS_VERSION RUN mkdir sgarest-daemon && \ - curl -L https://git.tecgraf.puc-rio.br/csbase-dev/sgarest-daemon/-/archive/master/sgarest-daemon-master.tar.gz | tar xzf - -C sgarest-daemon --strip-components 1 && \ + curl -L https://git.tecgraf.puc-rio.br/csbase-dev/sgarest-daemon/-/archive/${TAG}/sgarest-daemon-${TAG}.tar.gz | tar xzf - -C sgarest-daemon --strip-components 1 && \ cd sgarest-daemon && \ - luarocks install lua-schema-scm-1.rockspec && \ - luarocks make sga-daemon-scm-1.rockspec && \ - luarocks make sga-driver-posix-scm-1.rockspec + luarocks install lua-schema-*.rockspec && \ + luarocks make sga-daemon-*.rockspec && \ + luarocks make sga-driver-posix-*.rockspec WORKDIR /sgad diff --git a/docker.gitlab-ci.yml b/docker.gitlab-ci.yml index 340818c..af0d3a5 100644 --- a/docker.gitlab-ci.yml +++ b/docker.gitlab-ci.yml @@ -17,7 +17,7 @@ variables: - docker pull $DOCKER_REGISTRY$DOCKER_REGISTRY_IMAGE_DIND:$LAST || true - cd Docker/posix/ - | - docker build --cache-from $DOCKER_REGISTRY$CI_REGISTRY_IMAGE:$LAST \ + docker build $BUILD_ARGS --cache-from $DOCKER_REGISTRY$CI_REGISTRY_IMAGE:$LAST \ --tag $DOCKER_REGISTRY$CI_REGISTRY_IMAGE:$VERSION \ --tag $DOCKER_REGISTRY$CI_REGISTRY_IMAGE:$LAST \ --tag $DOCKER_REGISTRY$CI_REGISTRY_IMAGE:latest . @@ -46,6 +46,7 @@ docker_release: extends: .docker_deploy before_script: - export LAST="stable" + - export BUILD_ARGS="--build-arg TAG=${CI_COMMIT_TAG}" when: manual only: - tags -- GitLab From 564bda3d24cf918f1117422758dcf0f6ed2d172b Mon Sep 17 00:00:00 2001 From: Carlos Viana Date: Fri, 15 May 2020 17:31:50 -0300 Subject: [PATCH 2/2] =?UTF-8?q?Atualizando=20o=20release-prepare=20para=20?= =?UTF-8?q?gerar=20a=20vers=C3=A3o=20de=20desenvolvimento=20com=20valor=20?= =?UTF-8?q?scm-1=20e=20alterando=20os=20nomes=20dos=20rockspec=20para=20sc?= =?UTF-8?q?m-1.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [SOMA-3699] [SOMA-4525] --- release-prepare.sh | 14 +++++++------- ...-SNAPSHOT.rockspec => sga-daemon-scm-1.rockspec | 2 +- ...PSHOT.rockspec => sga-driver-pbs-scm-1.rockspec | 2 +- ...HOT.rockspec => sga-driver-posix-scm-1.rockspec | 2 +- ...HOT.rockspec => sga-driver-slurm-scm-1.rockspec | 2 +- ....2-SNAPSHOT.rockspec => sga-exec-scm-1.rockspec | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) rename sga-daemon-1.7.2-SNAPSHOT.rockspec => sga-daemon-scm-1.rockspec (97%) rename sga-driver-pbs-1.7.2-SNAPSHOT.rockspec => sga-driver-pbs-scm-1.rockspec (94%) rename sga-driver-posix-1.7.2-SNAPSHOT.rockspec => sga-driver-posix-scm-1.rockspec (95%) rename sga-driver-slurm-1.7.2-SNAPSHOT.rockspec => sga-driver-slurm-scm-1.rockspec (94%) rename sga-exec-1.7.2-SNAPSHOT.rockspec => sga-exec-scm-1.rockspec (95%) diff --git a/release-prepare.sh b/release-prepare.sh index 0c22c70..5985ba4 100755 --- a/release-prepare.sh +++ b/release-prepare.sh @@ -7,14 +7,13 @@ set -e # Uso: ./release-prepare-npm.sh VERSION_TO_RELEASE NEXT_SNAPSHOT_VERSION ############################################################################### -if [ "$#" != 2 ] +if [ "$#" != 1 ] then - echo "Uso: $0 " + echo "Uso: $0 " exit fi RELEASE=$1 -SNAPSHOT=$2 ROCKSPEC_REVISION=1 checkIsMaster() @@ -79,11 +78,12 @@ releaseVersion() nextSnapshotVersion() { - echo "[..] prepare for next development $SNAPSHOT..." - changeRockSpecs $SNAPSHOT - renameRockSpecs $SNAPSHOT + developmentVersion="scm-1" + echo "[..] prepare for next development $developmentVersion..." + changeRockSpecs $developmentVersion + renameRockSpecs $developmentVersion stageRockSpecs - git commit -m "[sgarest-daemon release] prepare for next development $SNAPSHOT" && \ + git commit -m "[sgarest-daemon release] prepare for next development $developmentVersion" && \ git push && \ echo "[ok]" } diff --git a/sga-daemon-1.7.2-SNAPSHOT.rockspec b/sga-daemon-scm-1.rockspec similarity index 97% rename from sga-daemon-1.7.2-SNAPSHOT.rockspec rename to sga-daemon-scm-1.rockspec index e684605..aa19176 100644 --- a/sga-daemon-1.7.2-SNAPSHOT.rockspec +++ b/sga-daemon-scm-1.rockspec @@ -1,6 +1,6 @@ package = "sga-daemon" -version = "1.7.2-SNAPSHOT" +version = "scm-1" source = { -- url = "git://git.tecgraf.puc-rio.br/csbase-dev/sgarest-daemon.git", diff --git a/sga-driver-pbs-1.7.2-SNAPSHOT.rockspec b/sga-driver-pbs-scm-1.rockspec similarity index 94% rename from sga-driver-pbs-1.7.2-SNAPSHOT.rockspec rename to sga-driver-pbs-scm-1.rockspec index 46f9f92..2ba071b 100644 --- a/sga-driver-pbs-1.7.2-SNAPSHOT.rockspec +++ b/sga-driver-pbs-scm-1.rockspec @@ -1,6 +1,6 @@ package = "sga-driver-pbs" -version = "1.7.2-SNAPSHOT" +version = "scm-1" source = { -- url = "git://git.tecgraf.puc-rio.br/csbase-dev/sgarest-daemon.git", diff --git a/sga-driver-posix-1.7.2-SNAPSHOT.rockspec b/sga-driver-posix-scm-1.rockspec similarity index 95% rename from sga-driver-posix-1.7.2-SNAPSHOT.rockspec rename to sga-driver-posix-scm-1.rockspec index d26a009..dd8cded 100644 --- a/sga-driver-posix-1.7.2-SNAPSHOT.rockspec +++ b/sga-driver-posix-scm-1.rockspec @@ -1,6 +1,6 @@ package = "sga-driver-posix" -version = "1.7.2-SNAPSHOT" +version = "scm-1" source = { -- url = "git://git.tecgraf.puc-rio.br/csbase-dev/sgarest-daemon.git", diff --git a/sga-driver-slurm-1.7.2-SNAPSHOT.rockspec b/sga-driver-slurm-scm-1.rockspec similarity index 94% rename from sga-driver-slurm-1.7.2-SNAPSHOT.rockspec rename to sga-driver-slurm-scm-1.rockspec index 91ae6a7..774ade3 100644 --- a/sga-driver-slurm-1.7.2-SNAPSHOT.rockspec +++ b/sga-driver-slurm-scm-1.rockspec @@ -1,5 +1,5 @@ package = "sga-driver-slurm" -version = "1.7.2-SNAPSHOT" +version = "scm-1" source = { -- url = "git://git.tecgraf.puc-rio.br/csbase-dev/sgarest-daemon.git", diff --git a/sga-exec-1.7.2-SNAPSHOT.rockspec b/sga-exec-scm-1.rockspec similarity index 95% rename from sga-exec-1.7.2-SNAPSHOT.rockspec rename to sga-exec-scm-1.rockspec index e815981..4e72c1a 100644 --- a/sga-exec-1.7.2-SNAPSHOT.rockspec +++ b/sga-exec-scm-1.rockspec @@ -1,6 +1,6 @@ package = "sga-exec" -version = "1.7.2-SNAPSHOT" +version = "scm-1" source = { -- url = "git://git.tecgraf.puc-rio.br/csbase-dev/sgarest-daemon.git", -- GitLab