From c136cd292ffd9428804b861e9e71b10e9f399a13 Mon Sep 17 00:00:00 2001
From: handreas <andreas.hamacher@monash.edu>
Date: Tue, 4 Feb 2020 04:05:11 +0000
Subject: [PATCH] config repos should be more robust with ubuntu
---
.gitlab-ci.yml | 2 +-
roles/config_repos/tasks/main.yml | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9e7c54b2..526c533e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -105,7 +105,7 @@ build_cluster_cicd:
- openstack stack list
- bash -x ./CICD/heat/heatcicdwrapper.sh create_or_update $STACKNAME
after_script:
- - sleep 30 # artifically wait a bit to give the nodes time to boot
+ - sleep 20 # artifically wait a bit to give the nodes time to boot
# only:
# changes: #https://docs.gitlab.com/ee/ci/yaml/#onlychangesexceptchanges
# - "heat/*HOT*.yaml"
diff --git a/roles/config_repos/tasks/main.yml b/roles/config_repos/tasks/main.yml
index 02bc8977..ec161e81 100644
--- a/roles/config_repos/tasks/main.yml
+++ b/roles/config_repos/tasks/main.yml
@@ -6,7 +6,7 @@
line: "118.138.244.7 consistency0"
owner: root
group: root
-
+ when: ansible_os_family == 'RedHat'
#- name: remove default repos
# file:
@@ -39,10 +39,12 @@
- monashhpc_base.repo
- monashhpc_others.repo
- epel.repo
+ when: ansible_os_family == 'RedHat'
- name: get enabled repos
#shell: yum repolist | grep -v "repo id" | grep -v "Loaded plugins" | head -n -1 | cut -f 1 -d '/' | sed -s 's/\!//'
shell: yum repolist all | grep enabled | cut -f 1 -d '/' | sed -s 's/\!//'
+ when: ansible_os_family == 'RedHat'
register: repolist
check_mode: no
changed_when: False
@@ -55,6 +57,7 @@
become: true
become_user: root
ignore_errors: true
+ when: ansible_os_family == 'RedHat'
#- name: Enable epel
--
GitLab