Merge branch 'upload_pacakges_to_staging_change' into 'master'

Change upload packages to staging

Closes #2583

See merge request !1750

.gitlab-ci.yml

@@ -608,19 +608,30 @@ OpenSUSE 42.1:
     - gems
   <<: *tag_build
 SLES 12:
+  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
     - ssh-keyscan -H dev.gitlab.org > ~/.ssh/known_hosts
+    - chmod -R 0600 ~/.ssh/
     - echo -e "[default]\naws_access_key_id = $AWS_ACCESS_KEY_ID \naws_secret_access_key = $AWS_SECRET_ACCESS_KEY" > ~/.aws/config
+    # GPG key for package signing
+    - AWS_ACCESS_KEY_ID="$SECRET_AWS_ACCESS_KEY_ID" AWS_SECRET_ACCESS_KEY="$SECRET_AWS_SECRET_ACCESS_KEY" aws s3 cp s3://omnibus-secrets/rpm_signing.gpg .
+    - gpg --batch --no-tty --allow-secret-key-import --import rpm_signing.gpg
     - export PACKAGECLOUD_REPO=$(bundle exec rake repository:target)
     - echo $PACKAGECLOUD_REPO
     - if ./support/is_gitlab_ee.sh; then make do_release; else exit 0;fi
   only:
     - tags@gitlab/omnibus-gitlab
-  allow_failure: true
-  tags:
-  - sles-12-0.0.1
+  artifacts:
+    expire_in: 1 day
+    paths:
+      - pkg/
+  cache:
+    key: "$CI_JOB_NAME"
+    paths:
+    - cache
+    - gems
 Ubuntu 14.04 branch:
   image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder:ubuntu_14.04-${BUILDER_IMAGE_REVISION}"
@@ -679,19 +690,30 @@ OpenSUSE 42.1 branch:
     - gems
   <<: *branch_build
 SLES 12 branch:
+  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
     - ssh-keyscan -H dev.gitlab.org > ~/.ssh/known_hosts
+    - chmod -R 0600 ~/.ssh/
     - echo -e "[default]\naws_access_key_id = $AWS_ACCESS_KEY_ID \naws_secret_access_key = $AWS_SECRET_ACCESS_KEY" > ~/.aws/config
+    # GPG key for package signing
+    - AWS_ACCESS_KEY_ID="$SECRET_AWS_ACCESS_KEY_ID" AWS_SECRET_ACCESS_KEY="$SECRET_AWS_SECRET_ACCESS_KEY" aws s3 cp s3://omnibus-secrets/rpm_signing.gpg .
+    - gpg --batch --no-tty --allow-secret-key-import --import rpm_signing.gpg
     - export PACKAGECLOUD_REPO=$(bundle exec rake repository:target)
     - echo $PACKAGECLOUD_REPO
     - if ./support/is_gitlab_ee.sh; then make test; else exit 0;fi
   only:
     - branches@gitlab/omnibus-gitlab
-  allow_failure: true
-  tags:
-  - sles-12-0.0.1
+  cache:
+    key: "$CI_JOB_NAME"
+    paths:
+    - cache
+    - gems
+  artifacts:
+    expire_in: 1 day
+    paths:
+      - pkg/
 Raspberry Pi 2 Jessie branch:
   image: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder:rpi_8-${BUILDER_IMAGE_REVISION}"
@@ -775,7 +797,9 @@ Docker Release:
       - pkg/
   only:
     - tags@gitlab/omnibus-gitlab
-    - branches@gitlab/omnibus-gitlab
+    - schedules@gitlab/omnibus-gitlab
+    - triggers@gitlab/omnibus-gitlab
+
 # This stage is ran only on tag:
 # 1. It is a manual action
@@ -811,11 +835,6 @@ Debian 8 staging:
     - Debian 8
     - Debian 8 branch
   <<: *staging_upload
-Debian 9 staging:
-  dependencies:
-    - Debian 9
-    - Debian 9 branch
-  <<: *staging_upload
 CentOS 6 staging:
   dependencies:
     - CentOS 6
@@ -826,10 +845,10 @@ CentOS 7 staging:
     - CentOS 7
     - CentOS 7 branch
   <<: *staging_upload
-OpenSUSE 42.2 staging:
+OpenSUSE 42.1 staging:
   dependencies:
-    - OpenSUSE 42.2
-    - OpenSUSE 42.2 branch
+    - OpenSUSE 42.1
+    - OpenSUSE 42.1 branch
   <<: *staging_upload
 SLES 12 staging:
   dependencies:
@@ -855,10 +874,6 @@ Debian 8 release:
   dependencies:
     - Debian 8 staging
   <<: *production_release
-Debian 9 release:
-  dependencies:
-    - Debian 9 staging
-  <<: *production_release
 CentOS 6 release:
   dependencies:
     - CentOS 6 staging
@@ -867,9 +882,9 @@ CentOS 7 release:
   dependencies:
     - CentOS 7 staging
   <<: *production_release
-OpenSUSE 42.2 release:
+OpenSUSE 42.1 release:
   dependencies:
-    - OpenSUSE 42.2 staging
+    - OpenSUSE 42.1 staging
   <<: *production_release
 SLES 12 release:
   dependencies: