Merge branch 'use-new-versioned-images' into 'master'

Use builder images under new version See merge request gitlab-org/omnibus-gitlab!2477

Merge branch 'use-new-versioned-images' into 'master'
907e0463 · Marin Jankovski · 9eded163 · 9d3b7408 · 907e0463
Commit 907e0463 authored 6 years ago by Marin Jankovski
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,7 +20,7 @@ stages:
  - notification_fail
  
 variables:
-  BUILDER_IMAGE_REVISION: "0.0.18"
+  BUILDER_IMAGE_REVISION: "0.0.19"
  ASSET_SYNC_EXISTING_REMOTE_FILES: "keep"
  ASSET_SYNC_GZIP_COMPRESSION: "true"
  
@@ -352,7 +352,7 @@ update-knapsack:
  retry: 1
  
 Trigger:package:
-  image: "registry.gitlab.com/gitlab-org/gitlab-omnibus-builder:ubuntu_16.04-${BUILDER_IMAGE_REVISION}"
+  image: "registry.gitlab.com/gitlab-org/gitlab-omnibus-builder/ubuntu_16.04:${BUILDER_IMAGE_REVISION}"
  stage: trigger-package
  script:
    - if [ -n "$TRIGGERED_USER" ] && [ -n "$TRIGGER_SOURCE" ]; then echo "Pipeline triggered by $TRIGGERED_USER at $TRIGGER_SOURCE"; fi
@@ -379,7 +379,7 @@ Trigger:package:
    - triggered-packages
  
 Trigger:gitlab-docker:
-  image: "registry.gitlab.com/gitlab-org/gitlab-omnibus-builder:ruby_docker-${BUILDER_IMAGE_REVISION}"
+  image: "registry.gitlab.com/gitlab-org/gitlab-omnibus-builder/ruby_docker:${BUILDER_IMAGE_REVISION}"
  stage: trigger-docker
  variables:
    DOCKER_DRIVER: overlay
@@ -401,7 +401,7 @@ Trigger:gitlab-docker:
  
 Trigger:qa-docker:
  stage: trigger-docker
-  image: "registry.gitlab.com/gitlab-org/gitlab-omnibus-builder:ruby_docker-${BUILDER_IMAGE_REVISION}"
+  image: "registry.gitlab.com/gitlab-org/gitlab-omnibus-builder/ruby_docker:${BUILDER_IMAGE_REVISION}"
  variables:
    DOCKER_DRIVER: overlay
    DOCKER_HOST: tcp://docker:2375
@@ -423,7 +423,7 @@ Trigger:qa-docker:
  
 Trigger:qa-test:
  stage: trigger-qa
-  image: "registry.gitlab.com/gitlab-org/gitlab-omnibus-builder:ruby_docker-${BUILDER_IMAGE_REVISION}"
+  image: "registry.gitlab.com/gitlab-org/gitlab-omnibus-builder/ruby_docker:${BUILDER_IMAGE_REVISION}"
  script:
    - if [ -n "$TRIGGERED_USER" ] && [ -n "$TRIGGER_SOURCE" ]; then echo "Pipeline triggered by $TRIGGERED_USER at $TRIGGER_SOURCE"; fi
    # For builds triggered from omnibus project, we are explicitly specifying IMAGE_TAG
@@ -733,34 +733,34 @@ OpenSUSE 42.3 specs 5 6:
 # dev.gitlab.org only
 # Release build
 Ubuntu-14.04:
-  image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder:ubuntu_14.04-${BUILDER_IMAGE_REVISION}"
+  image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder/ubuntu_14.04:${BUILDER_IMAGE_REVISION}"
  <<: *tag_build
 Ubuntu-16.04:
-  image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder:ubuntu_16.04-${BUILDER_IMAGE_REVISION}"
+  image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder/ubuntu_16.04:${BUILDER_IMAGE_REVISION}"
  <<: *tag_build
 Ubuntu-18.04:
-  image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder:ubuntu_18.04-${BUILDER_IMAGE_REVISION}"
+  image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder/ubuntu_18.04:${BUILDER_IMAGE_REVISION}"
  <<: *tag_build
 Debian-7:
-  image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder:debian_7-${BUILDER_IMAGE_REVISION}"
+  image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder/debian_7:${BUILDER_IMAGE_REVISION}"
  <<: *tag_build
 Debian-8:
-  image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder:debian_8-${BUILDER_IMAGE_REVISION}"
+  image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder/debian_8:${BUILDER_IMAGE_REVISION}"
  <<: *tag_build
 Debian-9.1:
-  image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder:debian_9-${BUILDER_IMAGE_REVISION}"
+  image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder/debian_9:${BUILDER_IMAGE_REVISION}"
  <<: *tag_build
 CentOS-6:
-  image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder:centos_6-${BUILDER_IMAGE_REVISION}"
+  image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder/centos_6:${BUILDER_IMAGE_REVISION}"
  <<: *tag_build
 CentOS-7:
-  image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder:centos_7-${BUILDER_IMAGE_REVISION}"
+  image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder/centos_7:${BUILDER_IMAGE_REVISION}"
  <<: *tag_build
 OpenSUSE-42.3:
-  image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder:opensuse_42.3-${BUILDER_IMAGE_REVISION}"
+  image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder/opensuse_42.3:${BUILDER_IMAGE_REVISION}"
  <<: *tag_build
 SLES-12:
-  image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder:sles_12sp2-${BUILDER_IMAGE_REVISION}"
+  image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder/sles_12sp2:${BUILDER_IMAGE_REVISION}"
  stage: package
  script:
    - echo "$DEV_GITLAB_SSH_KEY" > ~/.ssh/id_rsa
@@ -799,7 +799,7 @@ SLES-12:
  
 Docker:
  stage: images
-  image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder:ruby_docker-${BUILDER_IMAGE_REVISION}"
+  image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder/ruby_docker:${BUILDER_IMAGE_REVISION}"
  variables:
    DOCKER_DRIVER: overlay
    DOCKER_HOST: tcp://docker:2375
@@ -818,7 +818,7 @@ Docker:
  retry: 1
  
 Raspberry-Pi-2-Jessie:
-  image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder:rpi_8-${BUILDER_IMAGE_REVISION}"
+  image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder/rpi_8:${BUILDER_IMAGE_REVISION}"
  cache:
    key: "${CI_JOB_NAME}-branch-${BUILDER_IMAGE_REVISION}"
    paths:
@@ -830,34 +830,34 @@ Raspberry-Pi-2-Jessie:
  
 ## Building from branch
 Ubuntu-14.04-branch:
-  image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder:ubuntu_14.04-${BUILDER_IMAGE_REVISION}"
+  image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder/ubuntu_14.04:${BUILDER_IMAGE_REVISION}"
  <<: *branch_build
 Ubuntu-16.04-branch:
-  image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder:ubuntu_16.04-${BUILDER_IMAGE_REVISION}"
+  image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder/ubuntu_16.04:${BUILDER_IMAGE_REVISION}"
  <<: *branch_build
 Ubuntu-18.04-branch:
-  image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder:ubuntu_18.04-${BUILDER_IMAGE_REVISION}"
+  image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder/ubuntu_18.04:${BUILDER_IMAGE_REVISION}"
  <<: *branch_build
 Debian-7-branch:
-  image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder:debian_7-${BUILDER_IMAGE_REVISION}"
+  image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder/debian_7:${BUILDER_IMAGE_REVISION}"
  <<: *branch_build
 Debian-8-branch:
-  image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder:debian_8-${BUILDER_IMAGE_REVISION}"
+  image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder/debian_8:${BUILDER_IMAGE_REVISION}"
  <<: *branch_build
 Debian-9.1-branch:
-  image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder:debian_9-${BUILDER_IMAGE_REVISION}"
+  image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder/debian_9:${BUILDER_IMAGE_REVISION}"
  <<: *branch_build
 CentOS-6-branch:
-  image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder:centos_6-${BUILDER_IMAGE_REVISION}"
+  image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder/centos_6:${BUILDER_IMAGE_REVISION}"
  <<: *branch_build
 CentOS-7-branch:
-  image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder:centos_7-${BUILDER_IMAGE_REVISION}"
+  image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder/centos_7:${BUILDER_IMAGE_REVISION}"
  <<: *branch_build
 OpenSUSE-42.3-branch:
-  image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder:opensuse_42.3-${BUILDER_IMAGE_REVISION}"
+  image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder/opensuse_42.3:${BUILDER_IMAGE_REVISION}"
  <<: *branch_build
 SLES-12-branch:
-  image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder:sles_12sp2-${BUILDER_IMAGE_REVISION}"
+  image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder/sles_12sp2:${BUILDER_IMAGE_REVISION}"
  stage: package
  script:
    - echo "$DEV_GITLAB_SSH_KEY" > ~/.ssh/id_rsa
@@ -896,7 +896,7 @@ SLES-12-branch:
  
 Docker-branch:
  stage: images
-  image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder:ruby_docker-${BUILDER_IMAGE_REVISION}"
+  image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder/ruby_docker:${BUILDER_IMAGE_REVISION}"
  variables:
    DOCKER_DRIVER: overlay
    DOCKER_HOST: tcp://docker:2375
@@ -917,7 +917,7 @@ Docker-branch:
  
 QA-Master:
  stage: images
-  image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder:ruby_docker-${BUILDER_IMAGE_REVISION}"
+  image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder/ruby_docker:${BUILDER_IMAGE_REVISION}"
  variables:
    DOCKER_DRIVER: overlay
    DOCKER_HOST: tcp://docker:2375
@@ -945,7 +945,7 @@ QA-Master:
  retry: 1
  
 Raspberry-Pi-2-Jessie-branch:
-  image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder:rpi_8-${BUILDER_IMAGE_REVISION}"
+  image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder/rpi_8:${BUILDER_IMAGE_REVISION}"
  cache:
    key: "${CI_JOB_NAME}-${BUILDER_IMAGE_REVISION}"
    paths:
@@ -1088,7 +1088,7 @@ Raspberry-Pi-2-Jessie-release:
  
 Docker-Release:
  stage: image-release
-  image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder:ruby_docker-${BUILDER_IMAGE_REVISION}"
+  image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder/ruby_docker:${BUILDER_IMAGE_REVISION}"
  variables:
    DOCKER_DRIVER: overlay
    DOCKER_HOST: tcp://docker:2375
@@ -1103,7 +1103,7 @@ Docker-Release:
  
 AWS:
  stage: image-release
-  image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder:jessie_packer-${BUILDER_IMAGE_REVISION}"
+  image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder/jessie_packer:${BUILDER_IMAGE_REVISION}"
  script:
  # aws-sdk gem gives priority to environment variables over config file. So, using correct values for those variables.
  - export AWS_ACCESS_KEY_ID=$AWS_AMI_ACCESS_KEY_ID
@@ -1120,7 +1120,7 @@ AWS:
  
 QA-Tag:
  stage: image-release
-  image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder:ruby_docker-${BUILDER_IMAGE_REVISION}"
+  image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder/ruby_docker:${BUILDER_IMAGE_REVISION}"
  variables:
    DOCKER_DRIVER: overlay
    DOCKER_HOST: tcp://docker:2375
@@ -1149,7 +1149,7 @@ QA-Tag:
  
 upgrade:
  stage: metrics
-  image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder:ubuntu_16.04-${BUILDER_IMAGE_REVISION}"
+  image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder/ubuntu_16.04:${BUILDER_IMAGE_REVISION}"
  script:
    - echo $GCP_SERVICE_ACCOUNT > service_account.json
    - bundle exec rake metrics:upgrade_package
@@ -1161,7 +1161,7 @@ upgrade:
  - docker-builder
  
 release:packages:
-  image: "registry.gitlab.com/gitlab-org/gitlab-omnibus-builder:ruby_docker-${BUILDER_IMAGE_REVISION}"
+  image: "registry.gitlab.com/gitlab-org/gitlab-omnibus-builder/ruby_docker:${BUILDER_IMAGE_REVISION}"
  stage: trigger-packages
  script:
    - bundle exec ruby support/trigger-release.rb package-release
@@ -1170,7 +1170,7 @@ release:packages:
    - tags@gitlab/omnibus-gitlab
  
 release:images:
-  image: "registry.gitlab.com/gitlab-org/gitlab-omnibus-builder:ruby_docker-${BUILDER_IMAGE_REVISION}"
+  image: "registry.gitlab.com/gitlab-org/gitlab-omnibus-builder/ruby_docker:${BUILDER_IMAGE_REVISION}"
  stage: trigger-images
  script:
    - bundle exec ruby support/trigger-release.rb image-release