From b9abcc23cbb7a1195d5814f77398639cca66500e Mon Sep 17 00:00:00 2001 From: Max Regan Date: Sun, 3 May 2020 01:31:45 +0000 Subject: [PATCH 1/9] Update .gitlab-ci.yml to add a test Referenced from: https://docs.gitlab.com/ee/user/packages/container_registry/ --- .gitlab-ci.yml | 56 ++++++++++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 25 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1d3092d..9243860 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,28 +1,34 @@ -# This file is a template, and might need editing before it works on your project. -docker-build-master: - # Official docker image. - image: docker:latest - stage: build - services: - - docker:dind - before_script: - - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY - script: - - docker build --pull -t "$CI_REGISTRY_IMAGE" . - - docker push "$CI_REGISTRY_IMAGE" - only: - - master +image: docker:19.03.8 +services: + - docker:19.03.8-dind -docker-build: - # Official docker image. - image: docker:latest +stages: + - build + - test + - release + +variables: + CONTAINER_TEST_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG + CONTAINER_RELEASE_IMAGE: $CI_REGISTRY_IMAGE:latest + +before_script: + - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY + +build: stage: build - services: - - docker:dind - before_script: - - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY script: - - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" . - - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" - except: - - master + - docker build --pull -t $CONTAINER_TEST_IMAGE . + - docker push $CONTAINER_TEST_IMAGE + +test-gcc-version: + stage: test + script: + - docker pull $CONTAINER_TEST_IMAGE + - docker run $CONTAINER_TEST_IMAGE "arm-none-eabi-gcc -v" + +deploy: + stage: deploy + script: + - ./deploy.sh + only: + - master \ No newline at end of file From 7ad8080b8443c53d489e201eba61208ac035e21b Mon Sep 17 00:00:00 2001 From: Max Regan Date: Sun, 3 May 2020 01:34:21 +0000 Subject: [PATCH 2/9] Remove deploy stage, add release stage --- .gitlab-ci.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9243860..f4bf27d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,9 +26,11 @@ test-gcc-version: - docker pull $CONTAINER_TEST_IMAGE - docker run $CONTAINER_TEST_IMAGE "arm-none-eabi-gcc -v" -deploy: - stage: deploy +release: + stage: release script: - - ./deploy.sh + - docker pull $CONTAINER_TEST_IMAGE + - docker tag $CONTAINER_TEST_IMAGE $CONTAINER_RELEASE_IMAGE + - docker push $CONTAINER_RELEASE_IMAGE only: - master \ No newline at end of file From ceaf0d1aaa48defe41453a1c6c330c72390df8ff Mon Sep 17 00:00:00 2001 From: Max Regan Date: Sun, 3 May 2020 02:48:28 +0000 Subject: [PATCH 3/9] Make test into script to clean up .gitlab-ci --- .gitlab-ci.yml | 5 ++--- tests/smoke.sh | 6 ++++++ 2 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 tests/smoke.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f4bf27d..c9c1285 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,8 +24,7 @@ test-gcc-version: stage: test script: - docker pull $CONTAINER_TEST_IMAGE - - docker run $CONTAINER_TEST_IMAGE "arm-none-eabi-gcc -v" - + - docker run $CONTAINER_TEST_IMAGE tests/smoke.sh release: stage: release script: @@ -33,4 +32,4 @@ release: - docker tag $CONTAINER_TEST_IMAGE $CONTAINER_RELEASE_IMAGE - docker push $CONTAINER_RELEASE_IMAGE only: - - master \ No newline at end of file + - master diff --git a/tests/smoke.sh b/tests/smoke.sh new file mode 100644 index 0000000..ea24525 --- /dev/null +++ b/tests/smoke.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +set -ex + +which arm-none-eabi-gcc +arm-none-eabi-gcc From ff6d54b4f4293bbecc247c683bb23b9f8f0f16e5 Mon Sep 17 00:00:00 2001 From: Max Regan Date: Sun, 3 May 2020 03:08:52 +0000 Subject: [PATCH 4/9] Use bash? --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c9c1285..39f24be 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,7 +24,8 @@ test-gcc-version: stage: test script: - docker pull $CONTAINER_TEST_IMAGE - - docker run $CONTAINER_TEST_IMAGE tests/smoke.sh + - docker run $CONTAINER_TEST_IMAGE bash tests/smoke.sh + release: stage: release script: From 419efb7ac7ba79eb0cf466920273e2ef40fe9b48 Mon Sep 17 00:00:00 2001 From: Max Regan Date: Sun, 3 May 2020 03:13:16 +0000 Subject: [PATCH 5/9] Run the right image --- .gitlab-ci.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 39f24be..8a8f740 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,3 @@ -image: docker:19.03.8 -services: - - docker:19.03.8-dind - stages: - build - test @@ -15,6 +11,9 @@ before_script: - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY build: + image: docker:19.03.8 + services: + - docker:19.03.8-dind stage: build script: - docker build --pull -t $CONTAINER_TEST_IMAGE . @@ -22,11 +21,14 @@ build: test-gcc-version: stage: test + image: $CI_TEST_IMAGE script: - - docker pull $CONTAINER_TEST_IMAGE - - docker run $CONTAINER_TEST_IMAGE bash tests/smoke.sh + - tests/smoke.sh release: + image: docker:19.03.8 + services: + - docker:19.03.8-dind stage: release script: - docker pull $CONTAINER_TEST_IMAGE From 8e6fefb953a9fd42d732bc481770adf438fddbd8 Mon Sep 17 00:00:00 2001 From: Max Regan Date: Sun, 3 May 2020 03:17:09 +0000 Subject: [PATCH 6/9] Use the right name --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8a8f740..6550f5a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,7 +21,7 @@ build: test-gcc-version: stage: test - image: $CI_TEST_IMAGE + image: $CONTAINER_TEST_IMAGE script: - tests/smoke.sh From 1fd17dde8d88a3ac1b25e473247222d9f0abf36a Mon Sep 17 00:00:00 2001 From: Max Regan Date: Sun, 3 May 2020 03:21:02 +0000 Subject: [PATCH 7/9] Don't use "docker login" when testing --- .gitlab-ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6550f5a..e8927fd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,15 +7,13 @@ variables: CONTAINER_TEST_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG CONTAINER_RELEASE_IMAGE: $CI_REGISTRY_IMAGE:latest -before_script: - - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - build: image: docker:19.03.8 services: - docker:19.03.8-dind stage: build script: + - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - docker build --pull -t $CONTAINER_TEST_IMAGE . - docker push $CONTAINER_TEST_IMAGE @@ -31,6 +29,7 @@ release: - docker:19.03.8-dind stage: release script: + - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - docker pull $CONTAINER_TEST_IMAGE - docker tag $CONTAINER_TEST_IMAGE $CONTAINER_RELEASE_IMAGE - docker push $CONTAINER_RELEASE_IMAGE From 8f60f2ea7f113273af6e1b656a89af62c206e0c4 Mon Sep 17 00:00:00 2001 From: Max Regan Date: Sat, 2 May 2020 20:24:15 -0700 Subject: [PATCH 8/9] Add execute permission to test --- tests/smoke.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 tests/smoke.sh diff --git a/tests/smoke.sh b/tests/smoke.sh old mode 100644 new mode 100755 From d33c9a9a37e456ae01dfd813bd21dbf550f63366 Mon Sep 17 00:00:00 2001 From: Max Regan Date: Sun, 3 May 2020 03:27:13 +0000 Subject: [PATCH 9/9] Update smoke.sh --- tests/smoke.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/smoke.sh b/tests/smoke.sh index ea24525..7241f80 100755 --- a/tests/smoke.sh +++ b/tests/smoke.sh @@ -3,4 +3,4 @@ set -ex which arm-none-eabi-gcc -arm-none-eabi-gcc +arm-none-eabi-gcc -v