[gnome-build-meta/jjardon/upgrade_docker_image] .gitlab-ci.yml: Use latest docker image which includes correct buildstream version



commit f5182482a23b14cc8d2b02ff52433cbfb4f5aff7
Author: Javier Jardón <jjardon gnome org>
Date:   Mon Jan 14 16:33:23 2019 +0000

    .gitlab-ci.yml: Use latest docker image which includes correct buildstream version

 .gitlab-ci.yml | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bbe8df6..d8254f6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,14 +23,6 @@ cache:
 
 
 before_script:
-  # Remove any installed buildstream binary
-  - pip3 uninstall -y buildstream
-
-  # Use specific version of BuildStream
-  - git clone https://gitlab.com/BuildStream/buildstream.git
-  - git -C buildstream/ checkout $BST_SHA
-  - pip3 install buildstream/
-
   # install bst-external nedded for the flatpak_image plugin
   - git clone https://gitlab.com/BuildStream/bst-external.git
   - git -C bst-external/ checkout $BST_EXTERNAL_SHA
@@ -146,7 +138,7 @@ before_script:
 
 
 track:
-  image: buildstream/buildstream-fedora:master-123-abef70fe
+  image: buildstream/buildstream-fedora:a60f0c39-993e30ae
   stage: track
   script:
     - ${BST} track --deps all core.bst flatpak-runtimes.bst
@@ -166,7 +158,7 @@ track:
 
 
 build-gnome-core-x86_64:
-  image: buildstream/buildstream-fedora:master-123-abef70fe
+  image: buildstream/buildstream-fedora:a60f0c39-993e30ae
   <<: *build
   tags:
     - x86_64
@@ -175,7 +167,7 @@ build-gnome-core-x86_64:
     ARCH: x86_64
 
 build-gnome-core-i386:
-  image: buildstream/buildstream-fedora:master-123-abef70fe
+  image: buildstream/buildstream-fedora:a60f0c39-993e30ae
   <<: *build
   tags:
     - x86_64
@@ -185,7 +177,7 @@ build-gnome-core-i386:
   allow_failure: true
 
 build-gnome-core-aarch64:
-  image: buildstream/buildstream-fedora:aarch64-master-123-abef70fe
+  image: buildstream/buildstream-fedora:aarch64-a60f0c39-993e30ae
   <<: *build
   tags:
     - aarch64
@@ -195,7 +187,7 @@ build-gnome-core-aarch64:
   allow_failure: true
 
 build-gnome-core-arm:
-  image: buildstream/buildstream-fedora:aarch64-master-123-abef70fe
+  image: buildstream/buildstream-fedora:aarch64-a60f0c39-993e30ae
   <<: *build
   tags:
     - armhf
@@ -205,7 +197,7 @@ build-gnome-core-arm:
   allow_failure: true
 
 flatpak-x86_64:
-  image: buildstream/buildstream-fedora:master-123-abef70fe
+  image: buildstream/buildstream-fedora:a60f0c39-993e30ae
   <<: *flatpak
   tags:
     - x86_64
@@ -215,7 +207,7 @@ flatpak-x86_64:
     FLATPAK_ARCH: x86_64
 
 flatpak-i386:
-  image: buildstream/buildstream-fedora:master-123-abef70fe
+  image: buildstream/buildstream-fedora:a60f0c39-993e30ae
   <<: *flatpak
   tags:
     - x86_64
@@ -225,7 +217,7 @@ flatpak-i386:
     FLATPAK_ARCH: i386
 
 flatpak-aarch64:
-  image: buildstream/buildstream-fedora:aarch64-master-123-abef70fe
+  image: buildstream/buildstream-fedora:aarch64-a60f0c39-993e30ae
   <<: *flatpak
   tags:
     - aarch64
@@ -235,7 +227,7 @@ flatpak-aarch64:
     FLATPAK_ARCH: aarch64
 
 flatpak-arm:
-  image: buildstream/buildstream-fedora:aarch64-master-123-abef70fe
+  image: buildstream/buildstream-fedora:aarch64-a60f0c39-993e30ae
   <<: *flatpak
   tags:
     - armhf


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]