Skip to content

Commit 3874de3

Browse files
hswong3ihswong3i
committed
Merge branch 'release/7.2.0-4alvistack2'
2 parents b2ebf01 + 15fd8a9 commit 3874de3

31 files changed

+72
-63
lines changed

‎.gitlab-ci.yml‎

Lines changed: 29 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
---
22

3+
.script-git-submodule: &script-git-submodule
4+
- |
5+
git submodule sync --recursive
6+
git submodule update --init --recursive
7+
38
.script-bootstrap-packer: &script-bootstrap-packer
49
- |
510
curl -skL -O https://github.com/hashicorp/packer/releases/download/nightly/packer_linux_amd64.zip
611
sudo unzip -qq -o -d /usr/local/bin packer_linux_amd64.zip
712
rm -rf packer_linux_amd64.zip
813
9-
1014
.script-bootstrap-docker: &script-bootstrap-docker
1115
- |
1216
curl -skL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
@@ -22,43 +26,44 @@
2226
curl -skL https://bootstrap.pypa.io/get-pip.py | sudo -H python3 - --prefix=/usr/local
2327
sudo -H pip3 install --prefix=/usr/local --upgrade --ignore-installed --requirement requirements.txt
2428
29+
.script-linters: &script-linters
30+
- |
31+
yamllint .
32+
ansible-lint
33+
flake8
34+
2535
.script-packer-build: &script-packer-build
2636
- |
2737
cd packer/$_PACKER_BUILDER_PROVIDER-$_PACKER_BUILDER_VERSION
2838
sudo packer build packer.json
2939
40+
.script-docker-push: &script-docker-push
41+
- |
42+
echo $DOCKER_TOKEN | sudo docker login --username=$DOCKER_USERNAME --password-stdin
43+
export _DOCKER_IMAGE=$(sudo docker images | awk '{print $3}' | awk 'NR==2')
44+
export _DOCKER_REPO=$CI_PROJECT_NAMESPACE/$(echo $CI_PROJECT_NAME | sed 's/^docker-//g')
45+
if [[ -n "$CI_COMMIT_TAG" ]] && [[ "$CI_COMMIT_TAG" =~ ^$PACKER_BUILDER_VERSION ]]; then
46+
sudo docker tag $_DOCKER_IMAGE $_DOCKER_REPO:$CI_COMMIT_TAG
47+
sudo docker push $_DOCKER_REPO:$CI_COMMIT_TAG
48+
sudo docker tag $_DOCKER_IMAGE $_DOCKER_REPO:latest
49+
sudo docker push $_DOCKER_REPO:latest
50+
elif [[ -n "$CI_COMMIT_BRANCH" ]] && [[ "$CI_COMMIT_BRANCH" =~ master ]]; then
51+
sudo docker tag $_DOCKER_IMAGE $_DOCKER_REPO:$_PACKER_BUILDER_VERSION
52+
sudo docker push $_DOCKER_REPO:$_PACKER_BUILDER_VERSION
53+
fi
54+
3055
.job-packer: &job-packer
3156
script:
3257
- *script-bootstrap-packer
3358
- *script-bootstrap-docker
3459
- *script-bootstrap-ansible
60+
- *script-linters
3561
- *script-packer-build
62+
- *script-docker-push
3663

3764
default:
3865
before_script:
39-
- |
40-
git submodule sync --recursive
41-
git submodule update --init --recursive
42-
43-
- |
44-
yamllint .
45-
ansible-lint
46-
flake8
47-
48-
after_script:
49-
- |
50-
echo $DOCKER_TOKEN | sudo docker login --username=$DOCKER_USERNAME --password-stdin
51-
export _DOCKER_IMAGE=$(sudo docker images | awk '{print $3}' | awk 'NR==2')
52-
export _DOCKER_REPO=$CI_PROJECT_NAMESPACE/$(echo $CI_PROJECT_NAME | sed 's/^docker-//g')
53-
if [[ -n "$CI_COMMIT_TAG" ]] && [[ "$CI_COMMIT_TAG" =~ ^$PACKER_BUILDER_VERSION ]]; then
54-
sudo docker tag $_DOCKER_IMAGE $_DOCKER_REPO:$CI_COMMIT_TAG
55-
sudo docker push $_DOCKER_REPO:$CI_COMMIT_TAG
56-
sudo docker tag $_DOCKER_IMAGE $_DOCKER_REPO:latest
57-
sudo docker push $_DOCKER_REPO:latest
58-
elif [[ -n "$CI_COMMIT_BRANCH" ]] && [[ "$CI_COMMIT_BRANCH" =~ master ]]; then
59-
sudo docker tag $_DOCKER_IMAGE $_DOCKER_REPO:$_PACKER_BUILDER_VERSION
60-
sudo docker push $_DOCKER_REPO:$_PACKER_BUILDER_VERSION
61-
fi
66+
- *script-git-submodule
6267

6368
docker-7.1:
6469
<<: *job-packer

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
## 7.2.0-XalvistackY - TBC
44

5+
### Major Changes
6+
7+
## 7.2.0-4alvistack2 - 2020-12-09
8+
59
### Major Changes
610

711
- Migrate from Travis CI to GitLab CI

‎packer/docker-7.1/packer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"provisioners": [
3636
{
3737
"inline": [
38-
"set -ex",
38+
"set -euo pipefail",
3939
"apt-get update",
4040
"apt-get dist-upgrade -y",
4141
"apt-get install -y ca-certificates curl gcc iproute2 python3 python3-dev sudo"

‎packer/docker-7.2/packer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"provisioners": [
3636
{
3737
"inline": [
38-
"set -ex",
38+
"set -euo pipefail",
3939
"apt-get update",
4040
"apt-get dist-upgrade -y",
4141
"apt-get install -y ca-certificates curl gcc iproute2 python3 python3-dev sudo"

‎playbooks/prepare.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,38 +21,38 @@
2121
tasks:
2222
- name: cp -rfT /etc/skel /root
2323
raw: |
24-
set -ex
24+
set -euo pipefail
2525
cp -rfT /etc/skel /root
2626
changed_when: false
2727
ignore_errors: true
2828

2929
- name: setenforce 0
3030
raw: |
31-
set -ex
31+
set -euo pipefail
3232
setenforce 0
3333
sed -i 's/^SELINUX=.*$/SELINUX=permissive/g' /etc/selinux/config
3434
changed_when: false
3535
ignore_errors: true
3636

3737
- name: systemctl stop firewalld.service
3838
raw: |
39-
set -ex
39+
set -euo pipefail
4040
systemctl stop firewalld.service
4141
systemctl disable firewalld.service
4242
changed_when: false
4343
ignore_errors: true
4444

4545
- name: systemctl stop ufw.service
4646
raw: |
47-
set -ex
47+
set -euo pipefail
4848
systemctl stop ufw.service
4949
systemctl disable ufw.service
5050
changed_when: false
5151
ignore_errors: true
5252

5353
- name: redhat | subscription-manager register
5454
raw: |
55-
set -ex
55+
set -euo pipefail
5656
subscription-manager register \
5757
--username={{ lookup('env', 'REDHAT_USERNAME') }} \
5858
--password={{ lookup('env', 'REDHAT_PASSWORD') }} \
@@ -62,7 +62,7 @@
6262

6363
- name: debian | apt-get install -y ca-certificates curl gcc iproute2 python3 python3-dev sudo
6464
raw: |
65-
set -ex
65+
set -euo pipefail
6666
apt-get update
6767
apt-get dist-upgrade -y
6868
apt-get install -y ca-certificates curl gcc iproute2 python3 python3-dev sudo
@@ -71,7 +71,7 @@
7171

7272
- name: redhat | yum install -y ca-certificates curl gcc iproute python3 python3-devel sudo
7373
raw: |
74-
set -ex
74+
set -euo pipefail
7575
yum makecache
7676
yum update -y
7777
yum install -y ca-certificates curl gcc iproute python3 python3-devel sudo
@@ -80,7 +80,7 @@
8080

8181
- name: suse | zypper -n install -y ca-certificates curl gcc iproute2 python3 python3-devel sudo
8282
raw: |
83-
set -ex
83+
set -euo pipefail
8484
zypper -n --gpg-auto-import-keys refresh
8585
zypper -n update -y
8686
zypper -n install -y ca-certificates curl gcc iproute2 python3 python3-devel sudo

‎playbooks/side_effect.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
tasks:
2222
- name: rm -rf /root/.ansible/tmp/*
2323
raw: |
24-
set -ex
24+
set -euo pipefail
2525
rm -rf /root/.ansible/tmp/*
2626
rm -rf /root/.cache/*
2727
rm -rf /tmp/*
@@ -30,7 +30,7 @@
3030

3131
- name: debian | apt-get -y autoclean
3232
raw: |
33-
set -ex
33+
set -euo pipefail
3434
apt-get -y autoremove
3535
apt-get -y autoclean
3636
rm -rf /var/lib/apt/lists/*
@@ -39,15 +39,15 @@
3939

4040
- name: redhat | yum clean all
4141
raw: |
42-
set -ex
42+
set -euo pipefail
4343
yum clean all
4444
rm -rf /var/cache/yum/*
4545
changed_when: false
4646
ignore_errors: true
4747

4848
- name: suse | zypper clean --all
4949
raw: |
50-
set -ex
50+
set -euo pipefail
5151
zypper clean --all
5252
rm -rf /var/cache/zypper/*
5353
changed_when: false

‎playbooks/templates/usr/local/bin/docker-entrypoint.sh.j2‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# {{ ansible_managed }}
44

5-
set -o xtrace
5+
set -euo pipefail
66

77
# Prepend executable if command starts with an option
88
if [ "${1:0:1}" = '-' ]; then

‎roles/bamboo‎

‎roles/buildah‎

‎roles/catatonit‎

0 commit comments

Comments
 (0)