-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
migrate aws jenkins environment to fully dockerized environment
Also, upgrade packages, available JDKs, etc.
- Loading branch information
1 parent
2885210
commit 63b6e0f
Showing
15 changed files
with
234 additions
and
335 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 8 additions & 0 deletions
8
packer/provisioners/ansible/roles/security/tasks/users-and-groups.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,14 @@ | ||
--- | ||
- name: Create groups. | ||
group: | ||
name: "{{ item.name }}" | ||
gid: "{{ item.gid }}" | ||
loop: "{{ users }}" | ||
|
||
- name: Create users. | ||
user: | ||
name: "{{ item.name }}" | ||
shell: "{{ item.shell | default('/bin/bash') }}" | ||
uid: "{{ item.uid }}" | ||
group: "{{ item.name }}" | ||
loop: "{{ users }}" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
packer/provisioners/ansible/roles/temurin/tasks/fetch_remote.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,5 +4,5 @@ base_install_name: temurin | |
java_versions: | ||
- 8 | ||
- 11 | ||
- 16 | ||
- 17 | ||
- 21 |
23 changes: 3 additions & 20 deletions
23
packer/provisioners/ansible/roles/thredds-test-data-mount-prep/tasks/main.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,25 +1,8 @@ | ||
--- | ||
- name: List information about '{{ volume_device_name }}' block device. | ||
command: lsblk {{ volume_device_name }} | ||
register: lsblk_output | ||
changed_when: false # Task is purely informational; it doesn't change anything. | ||
ignore_errors: true # Task is expected to fail when device doesn't exist. We handle that case below. | ||
|
||
- name: Determine if '{{ volume_device_name }}' block device exists. | ||
set_fact: | ||
volume_device_exists: "{{ lsblk_output.rc == 0 }}" | ||
|
||
- name: Ensure the '{{ cdmUnitTest_mount_dir }}' exists. | ||
file: | ||
path: "{{ cdmUnitTest_mount_dir }}" | ||
state: directory | ||
|
||
- name: Add entry for '{{ volume_device_name }}' to /etc/fstab, and mount it if it's available. | ||
mount: | ||
src: "{{ volume_device_name }}" | ||
path: "{{ cdmUnitTest_mount_dir }}" | ||
fstype: "{{ filesystem_type }}" | ||
opts: defaults,nofail # Don't fail when the device isn't available, which will happen in dev and test environments. | ||
dump: "0" | ||
passno: "2" | ||
state: "{{ volume_device_exists | ternary('mounted', 'present') }}" | ||
owner: "{{ thredds_test_user }}" | ||
group: "{{ thredds_test_user }}" | ||
mode: "0755" |
10 changes: 1 addition & 9 deletions
10
packer/provisioners/ansible/roles/thredds-test-data-mount-prep/vars/main.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,3 @@ | ||
--- | ||
# The name of the device to which AWS will mount the cdmUnitTest snapshot. We set this in Jenkins under: | ||
# "Manage Jenkins"->"Configure System"->"Cloud"->"Amazon EC2"->"AMIs"->"Advanced..."->"Block device mapping". | ||
# For example, we have something like: "/dev/xvdf=<snap-id>::true" | ||
volume_device_name: /dev/xvdf | ||
|
||
# The directory at which the cdmUnitTest EBS snapshot should be mounted. | ||
# The directory at which the THREDDS test data should be mounted. | ||
cdmUnitTest_mount_dir: /share/testdata/cdmUnitTest | ||
|
||
# The filesystem of the snapshot. | ||
filesystem_type: ext4 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,6 +4,5 @@ base_install_name: zulu | |
java_versions: | ||
- 8 | ||
- 11 | ||
- 14 | ||
- 16 | ||
- 17 | ||
- 21 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,149 @@ | ||
#!/usr/bin/env bash | ||
|
||
JENKINS_JAVA_BIN="/usr/thredds-test-environment/temurin21/bin/java" | ||
JENKINS_AGENT_FILE="/home/jenkins/agent.jar" | ||
JENKINS_WEB_SOCKET=true | ||
JENKINS_AGENT_WORKDIR="/home/jenkins/workspace" | ||
|
||
# copied from https://github.com/jenkinsci/docker-agent/blob/master/jenkins-agent | ||
# modified above these lines to to use custom image settings | ||
|
||
# The MIT License | ||
# | ||
# Copyright (c) 2015-2020, CloudBees, Inc. | ||
# | ||
# Permission is hereby granted, free of charge, to any person obtaining a copy | ||
# of this software and associated documentation files (the "Software"), to deal | ||
# in the Software without restriction, including without limitation the rights | ||
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
# copies of the Software, and to permit persons to whom the Software is | ||
# furnished to do so, subject to the following conditions: | ||
# | ||
# The above copyright notice and this permission notice shall be included in | ||
# all copies or substantial portions of the Software. | ||
# | ||
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
# THE SOFTWARE. | ||
|
||
# Usage jenkins-agent.sh [options] -url http://jenkins -secret [SECRET] -name [AGENT_NAME] | ||
# Optional environment variables : | ||
# * JENKINS_JAVA_BIN : Java executable to use instead of the default in PATH or obtained from JAVA_HOME | ||
# * JENKINS_JAVA_OPTS : Java Options to use for the remoting process, otherwise obtained from JAVA_OPTS | ||
# * JENKINS_AGENT_FILE : Jenkins agent jar file location, /usr/share/jenkins/agent.jar will be used if this is not set | ||
# * REMOTING_OPTS : Generic way to pass additional CLI options to agent.jar (see -help) | ||
# | ||
# Deprecated environment variables (prefer setting REMOTING_OPTS) | ||
# * JENKINS_TUNNEL : HOST:PORT for a tunnel to route TCP traffic to jenkins host, when jenkins can't be directly accessed over network | ||
# * JENKINS_URL : alternate jenkins URL | ||
# * JENKINS_SECRET : agent secret, if not set as an argument | ||
# * JENKINS_AGENT_NAME : agent name, if not set as an argument | ||
# * JENKINS_AGENT_WORKDIR : agent work directory, if not set by optional parameter -workDir | ||
# * JENKINS_WEB_SOCKET: true if the connection should be made via WebSocket rather than TCP | ||
# * JENKINS_DIRECT_CONNECTION: Connect directly to this TCP agent port, skipping the HTTP(S) connection parameter download. | ||
# Value: "<HOST>:<PORT>" | ||
# * JENKINS_INSTANCE_IDENTITY: The base64 encoded InstanceIdentity byte array of the Jenkins controller. When this is set, | ||
# the agent skips connecting to an HTTP(S) port for connection info. | ||
# * JENKINS_PROTOCOLS: Specify the remoting protocols to attempt when instanceIdentity is provided. | ||
|
||
if [ $# -eq 1 ] && [ "${1#-}" = "$1" ] ; then | ||
|
||
# if `docker run` only has one arguments and it is not an option as `-help`, we assume user is running alternate command like `bash` to inspect the image | ||
exec "$@" | ||
|
||
else | ||
|
||
# if -tunnel is not provided, try env vars | ||
case "$@" in | ||
*"-tunnel "*) ;; | ||
*) | ||
if [ ! -z "$JENKINS_TUNNEL" ]; then | ||
TUNNEL="-tunnel $JENKINS_TUNNEL" | ||
fi ;; | ||
esac | ||
|
||
# if -workDir is not provided, try env vars | ||
if [ ! -z "$JENKINS_AGENT_WORKDIR" ]; then | ||
case "$@" in | ||
*"-workDir"*) echo "Warning: Work directory is defined twice in command-line arguments and the environment variable" ;; | ||
*) | ||
WORKDIR="-workDir $JENKINS_AGENT_WORKDIR" ;; | ||
esac | ||
fi | ||
|
||
if [ -n "$JENKINS_URL" ]; then | ||
URL="-url $JENKINS_URL" | ||
fi | ||
|
||
if [ -n "$JENKINS_NAME" ]; then | ||
JENKINS_AGENT_NAME="$JENKINS_NAME" | ||
fi | ||
|
||
if [ "$JENKINS_WEB_SOCKET" = true ]; then | ||
WEB_SOCKET=-webSocket | ||
fi | ||
|
||
if [ -n "$JENKINS_PROTOCOLS" ]; then | ||
PROTOCOLS="-protocols $JENKINS_PROTOCOLS" | ||
fi | ||
|
||
if [ -n "$JENKINS_DIRECT_CONNECTION" ]; then | ||
DIRECT="-direct $JENKINS_DIRECT_CONNECTION" | ||
fi | ||
|
||
if [ -n "$JENKINS_INSTANCE_IDENTITY" ]; then | ||
INSTANCE_IDENTITY="-instanceIdentity $JENKINS_INSTANCE_IDENTITY" | ||
fi | ||
|
||
if [ "$JENKINS_JAVA_BIN" ]; then | ||
JAVA_BIN="$JENKINS_JAVA_BIN" | ||
else | ||
# if java home is defined, use it | ||
JAVA_BIN="java" | ||
if [ "$JAVA_HOME" ]; then | ||
JAVA_BIN="$JAVA_HOME/bin/java" | ||
fi | ||
fi | ||
|
||
if [ "$JENKINS_JAVA_OPTS" ]; then | ||
JAVA_OPTIONS="$JENKINS_JAVA_OPTS" | ||
else | ||
# if JAVA_OPTS is defined, use it | ||
if [ "$JAVA_OPTS" ]; then | ||
JAVA_OPTIONS="$JAVA_OPTS" | ||
fi | ||
fi | ||
|
||
if [ "$JENKINS_AGENT_FILE" ]; then | ||
AGENT_FILE="$JENKINS_AGENT_FILE" | ||
else | ||
AGENT_FILE="/usr/share/jenkins/agent.jar" | ||
fi | ||
|
||
# if both required options are defined, do not pass the parameters | ||
if [ -n "$JENKINS_SECRET" ]; then | ||
case "$@" in | ||
*"${JENKINS_SECRET}"*) echo "Warning: SECRET is defined twice in command-line arguments and the environment variable" ;; | ||
*) | ||
SECRET="-secret ${JENKINS_SECRET}" ;; | ||
esac | ||
fi | ||
|
||
if [ -n "$JENKINS_AGENT_NAME" ]; then | ||
case "$@" in | ||
*"${JENKINS_AGENT_NAME}"*) echo "Warning: AGENT_NAME is defined twice in command-line arguments and the environment variable" ;; | ||
*) | ||
AGENT_NAME="-name ${JENKINS_AGENT_NAME}" ;; | ||
esac | ||
fi | ||
|
||
#TODO: Handle the case when the command-line and Environment variable contain different values. | ||
#It is fine it blows up for now since it should lead to an error anyway. | ||
|
||
exec $JAVA_BIN $JAVA_OPTIONS -jar $AGENT_FILE $SECRET $AGENT_NAME $TUNNEL $URL $WORKDIR $WEB_SOCKET $DIRECT $PROTOCOLS $INSTANCE_IDENTITY $REMOTING_OPTS "$@" | ||
|
||
fi |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.