Merge branch 'release/4.8.4-4alvistack9'

alvistack · Dec 9, 2020 · 227e95e · 227e95e
2 parents 7345ca4 + ec2104f
commit 227e95e
Show file tree

Hide file tree

Showing 23 changed files with 64 additions and 55 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -1,12 +1,16 @@
 ---
 
+.script-git-submodule: &script-git-submodule
+  - |
+    git submodule sync --recursive
+    git submodule update --init --recursive
+
 .script-bootstrap-packer: &script-bootstrap-packer
   - |
     curl -skL -O https://github.com/hashicorp/packer/releases/download/nightly/packer_linux_amd64.zip
     sudo unzip -qq -o -d /usr/local/bin packer_linux_amd64.zip
     rm -rf packer_linux_amd64.zip
 
-
 .script-bootstrap-docker: &script-bootstrap-docker
   - |
     curl -skL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
@@ -22,43 +26,44 @@
     curl -skL https://bootstrap.pypa.io/get-pip.py | sudo -H python3 - --prefix=/usr/local
     sudo -H pip3 install --prefix=/usr/local --upgrade --ignore-installed --requirement requirements.txt
 
+.script-linters: &script-linters
+  - |
+    yamllint .
+    ansible-lint
+    flake8
+
 .script-packer-build: &script-packer-build
   - |
     cd packer/$_PACKER_BUILDER_PROVIDER-$_PACKER_BUILDER_VERSION
     sudo packer build packer.json
 
+.script-docker-push: &script-docker-push
+  - |
+    echo $DOCKER_TOKEN | sudo docker login --username=$DOCKER_USERNAME --password-stdin
+    export _DOCKER_IMAGE=$(sudo docker images | awk '{print $3}' | awk 'NR==2')
+    export _DOCKER_REPO=$CI_PROJECT_NAMESPACE/$(echo $CI_PROJECT_NAME | sed 's/^docker-//g')
+    if [[ -n "$CI_COMMIT_TAG" ]] && [[ "$CI_COMMIT_TAG" =~ ^$PACKER_BUILDER_VERSION ]]; then
+      sudo docker tag $_DOCKER_IMAGE $_DOCKER_REPO:$CI_COMMIT_TAG
+      sudo docker push $_DOCKER_REPO:$CI_COMMIT_TAG
+      sudo docker tag $_DOCKER_IMAGE $_DOCKER_REPO:latest
+      sudo docker push $_DOCKER_REPO:latest
+    elif [[ -n "$CI_COMMIT_BRANCH" ]] && [[ "$CI_COMMIT_BRANCH" =~ master ]]; then
+      sudo docker tag $_DOCKER_IMAGE $_DOCKER_REPO:$_PACKER_BUILDER_VERSION
+      sudo docker push $_DOCKER_REPO:$_PACKER_BUILDER_VERSION
+    fi
+
 .job-packer: &job-packer
   script:
     - *script-bootstrap-packer
     - *script-bootstrap-docker
     - *script-bootstrap-ansible
+    - *script-linters
     - *script-packer-build
+    - *script-docker-push
 
 default:
   before_script:
-    - |
-      git submodule sync --recursive
-      git submodule update --init --recursive
-
-    - |
-      yamllint .
-      ansible-lint
-      flake8
-
-  after_script:
-    - |
-      echo $DOCKER_TOKEN | sudo docker login --username=$DOCKER_USERNAME --password-stdin
-      export _DOCKER_IMAGE=$(sudo docker images | awk '{print $3}' | awk 'NR==2')
-      export _DOCKER_REPO=$CI_PROJECT_NAMESPACE/$(echo $CI_PROJECT_NAME | sed 's/^docker-//g')
-      if [[ -n "$CI_COMMIT_TAG" ]] && [[ "$CI_COMMIT_TAG" =~ ^$PACKER_BUILDER_VERSION ]]; then
-        sudo docker tag $_DOCKER_IMAGE $_DOCKER_REPO:$CI_COMMIT_TAG
-        sudo docker push $_DOCKER_REPO:$CI_COMMIT_TAG
-        sudo docker tag $_DOCKER_IMAGE $_DOCKER_REPO:latest
-        sudo docker push $_DOCKER_REPO:latest
-      elif [[ -n "$CI_COMMIT_BRANCH" ]] && [[ "$CI_COMMIT_BRANCH" =~ master ]]; then
-        sudo docker tag $_DOCKER_IMAGE $_DOCKER_REPO:$_PACKER_BUILDER_VERSION
-        sudo docker push $_DOCKER_REPO:$_PACKER_BUILDER_VERSION
-      fi
+    - *script-git-submodule
 
 docker-4.8:
   <<: *job-packer

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## 4.8.4-XalvistackY - TBC
 
+### Major Changes
+
+## 4.8.4-4alvistack9 - 2020-12-09
+
 ### Major Changes
 
   - Migrate from Travis CI to GitLab CI

diff --git a/packer/docker-4.7/packer.json b/packer/docker-4.7/packer.json
@@ -35,7 +35,7 @@
   "provisioners": [
     {
       "inline": [
-        "set -ex",
+        "set -euo pipefail",
         "apt-get update",
         "apt-get dist-upgrade -y",
         "apt-get install -y ca-certificates curl gcc iproute2 python3 python3-dev sudo"

diff --git a/packer/docker-4.8/packer.json b/packer/docker-4.8/packer.json
@@ -35,7 +35,7 @@
   "provisioners": [
     {
       "inline": [
-        "set -ex",
+        "set -euo pipefail",
         "apt-get update",
         "apt-get dist-upgrade -y",
         "apt-get install -y ca-certificates curl gcc iproute2 python3 python3-dev sudo"

diff --git a/playbooks/prepare.yml b/playbooks/prepare.yml
@@ -21,38 +21,38 @@
   tasks:
     - name: cp -rfT /etc/skel /root
       raw: |
-        set -ex
+        set -euo pipefail
         cp -rfT /etc/skel /root
       changed_when: false
       ignore_errors: true
 
     - name: setenforce 0
       raw: |
-        set -ex
+        set -euo pipefail
         setenforce 0
         sed -i 's/^SELINUX=.*$/SELINUX=permissive/g' /etc/selinux/config
       changed_when: false
       ignore_errors: true
 
     - name: systemctl stop firewalld.service
       raw: |
-        set -ex
+        set -euo pipefail
         systemctl stop firewalld.service
         systemctl disable firewalld.service
       changed_when: false
       ignore_errors: true
 
     - name: systemctl stop ufw.service
       raw: |
-        set -ex
+        set -euo pipefail
         systemctl stop ufw.service
         systemctl disable ufw.service
       changed_when: false
       ignore_errors: true
 
     - name: redhat | subscription-manager register
       raw: |
-        set -ex
+        set -euo pipefail
         subscription-manager register \
           --username={{ lookup('env', 'REDHAT_USERNAME') }} \
           --password={{ lookup('env', 'REDHAT_PASSWORD') }} \
@@ -62,7 +62,7 @@
 
     - name: debian | apt-get install -y ca-certificates curl gcc iproute2 python3 python3-dev sudo
       raw: |
-        set -ex
+        set -euo pipefail
         apt-get update
         apt-get dist-upgrade -y
         apt-get install -y ca-certificates curl gcc iproute2 python3 python3-dev sudo
@@ -71,7 +71,7 @@
 
     - name: redhat | yum install -y ca-certificates curl gcc iproute python3 python3-devel sudo
       raw: |
-        set -ex
+        set -euo pipefail
         yum makecache
         yum update -y
         yum install -y ca-certificates curl gcc iproute python3 python3-devel sudo
@@ -80,7 +80,7 @@
 
     - name: suse | zypper -n install -y ca-certificates curl gcc iproute2 python3 python3-devel sudo
       raw: |
-        set -ex
+        set -euo pipefail
         zypper -n --gpg-auto-import-keys refresh
         zypper -n update -y
         zypper -n install -y ca-certificates curl gcc iproute2 python3 python3-devel sudo

diff --git a/playbooks/side_effect.yml b/playbooks/side_effect.yml
@@ -21,7 +21,7 @@
   tasks:
     - name: rm -rf /root/.ansible/tmp/*
       raw: |
-        set -ex
+        set -euo pipefail
         rm -rf /root/.ansible/tmp/*
         rm -rf /root/.cache/*
         rm -rf /tmp/*
@@ -30,7 +30,7 @@
 
     - name: debian | apt-get -y autoclean
       raw: |
-        set -ex
+        set -euo pipefail
         apt-get -y autoremove
         apt-get -y autoclean
         rm -rf /var/lib/apt/lists/*
@@ -39,15 +39,15 @@
 
     - name: redhat | yum clean all
       raw: |
-        set -ex
+        set -euo pipefail
         yum clean all
         rm -rf /var/cache/yum/*
       changed_when: false
       ignore_errors: true
 
     - name: suse | zypper clean --all
       raw: |
-        set -ex
+        set -euo pipefail
         zypper clean --all
         rm -rf /var/cache/zypper/*
       changed_when: false

diff --git a/playbooks/templates/usr/local/bin/docker-entrypoint.sh.j2 b/playbooks/templates/usr/local/bin/docker-entrypoint.sh.j2
@@ -2,7 +2,7 @@
 
 # {{ ansible_managed }}
 
-set -o xtrace
+set -euo pipefail
 
 # Prepend executable if command starts with an option
 if [ "${1:0:1}" = '-' ]; then

diff --git a/roles/catatonit b/roles/catatonit
diff --git a/roles/cvs b/roles/cvs
diff --git a/roles/fisheye b/roles/fisheye
diff --git a/roles/git b/roles/git
diff --git a/roles/gosu b/roles/gosu
diff --git a/roles/locales b/roles/locales
diff --git a/roles/mercurial b/roles/mercurial
diff --git a/roles/openjdk b/roles/openjdk
diff --git a/roles/perforce b/roles/perforce
diff --git a/roles/python b/roles/python
diff --git a/roles/svn b/roles/svn
diff --git a/roles/timezone b/roles/timezone
diff --git a/scripts/bootstrap-ansible.sh b/scripts/bootstrap-ansible.sh
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set -o xtrace
+set -euo pipefail
 
 cd "$(cd "$(dirname "$0")"; pwd -P)/../"
 

diff --git a/scripts/bootstrap-libvirt.sh b/scripts/bootstrap-libvirt.sh
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set -o xtrace
+set -euo pipefail
 
 cd "$(cd "$(dirname "$0")"; pwd -P)/../"
 

diff --git a/scripts/bootstrap-vagrant.sh b/scripts/bootstrap-vagrant.sh
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set -o xtrace
+set -euo pipefail
 
 cd "$(cd "$(dirname "$0")"; pwd -P)/../"
 

diff --git a/scripts/run-build.sh b/scripts/run-build.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -o xtrace
+set -euo pipefail
 
 DIR=$(dirname "$(readlink -f "$0")")
+13 −8		.gitlab-ci.yml
+1 −1		molecule/centos-7/molecule.yml
+1 −1		molecule/centos-8/molecule.yml
+1 −1		molecule/debian-10/molecule.yml
+1 −1		molecule/default/molecule.yml
+8 −8		molecule/default/prepare.yml
+1 −1		molecule/fedora-33/molecule.yml
+1 −1		molecule/redhat-7/molecule.yml
+1 −4		molecule/redhat-8/molecule.yml
+1 −1		molecule/suse-15/molecule.yml
+1 −1		molecule/ubuntu-18.04/molecule.yml
+1 −1		molecule/ubuntu-20.04/molecule.yml
+1 −1		molecule/ubuntu-20.10/molecule.yml
+1 −1		scripts/bootstrap-ansible.sh
+1 −1		scripts/bootstrap-vagrant.sh
+1 −1		tasks/main.yml