Commit eca5fa23 authored by Petras, Randy's avatar Petras, Randy
Browse files

Minor tweaks making it closer to a "basic" runner

parent 82fb6ae5

.gitlab-ci.yml

+20 −16
Original line number Diff line number Diff line
@@ -4,20 +4,19 @@ variables: 
    TF_ROOT: ${CI_PROJECT_DIR}/terraform

    TF_ADDRESS: ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/terraform/state/k8s-cluster

    ANSIBLE_TERRAFORM_IMAGE: code.ornl.gov:4567/rse/images/ansible-terraform/ubuntu:0.2.0

    OS_USERNAME: ${OS_USERNAME}



# This import is for the func_rse_docker_* functions

before_script:

    - docker login --username=$CI_REGISTRY_USER --password=$CI_REGISTRY_PASSWORD $CI_REGISTRY

    #- docker login --username=$CI_REGISTRY_USER --password=$CI_REGISTRY_PASSWORD $CI_REGISTRY

    - curl https://code.ornl.gov/rse-deployment/rse-sharables/raw/master/rse-bash-modules.sh -O

    - source rse-bash-modules.sh

    - curl https://code.ornl.gov/rse-terraform-modules/shareable-scripts/raw/main/docker-terraform.sh -O

    - source docker-terraform.sh

    - func_rse_docker_cleanup

    - sudo rm -rf ${TF_ROOT}/.terraform || true

    - mv ${SSH_KEY} ${TF_ROOT}/ssh-key

    - chmod 600 ${TF_ROOT}/ssh-key

    - ssh-keygen -y -f ${TF_ROOT}/ssh-key > ${TF_ROOT}/ssh-key.pub

    #- mv ${SSH_KEY} ${TF_ROOT}/ssh-key

    #- chmod 600 ${TF_ROOT}/ssh-key

    #- ssh-keygen -y -f ${TF_ROOT}/ssh-key > ${TF_ROOT}/ssh-key.pub

    - export OS_AUTH_URL=${NEW_OS_AUTH_URL}    

    - export OS_PROJECT_ID=${NEW_OS_PROJECT_ID}    

    - export OS_PROJECT_NAME=${NEW_OS_PROJECT_NAME}
@@ -26,20 +25,19 @@ before_script: 
    - export OS_PASSWORD=${NEW_OS_PASSWORD}







after_script:

    - source rse-bash-modules.sh

    - func_rse_docker_cleanup

    #- source rse-bash-modules.sh

    #- func_rse_docker_cleanup

    - sudo chown -R gitlab-runner .

    - sudo rm -rf ${TF_ROOT}/terraform/.terraform

    #- sudo rm -rf ${TF_ROOT}/terraform/.terraform



stages:

    - prepare

    - validate

    - build 

    - deploy

    - configure

    - post-setup

    #- configure

    #- post-setup

    - destroy



init:
@@ -62,6 +60,9 @@ plan: 
    stage: build

    script:

    - mv ${TFVARS_FILE} ${TF_ROOT}/terraform.tfvars

    - mv ${SSH_KEY} ${TF_ROOT}/ssh-key

    - chmod 600 ${TF_ROOT}/ssh-key

    - ssh-keygen -y -f ./ssh-key > ./ssh-key.pub

    - docker_terraform init

    - docker_terraform_with_openstack "plan -var=ssh_key_file=ssh-key"

    - docker_terraform_with_openstack plan-json
@@ -77,7 +78,10 @@ plan: 
apply:

    stage: deploy

    script:

        - apt-key adv --keyserver keyserver.ubuntu.com --recv-keys D8FF8E1F7DF8B07E

    - mv ${SSH_KEY} ${TF_ROOT}/ssh-key

    - chmod 600 ${TF_ROOT}/ssh-key

    - ssh-keygen -y -f ./ssh-key > ./ssh-key.pub

    #- apt-key adv --keyserver keyserver.ubuntu.com --recv-keys D8FF8E1F7DF8B07E

    - docker_terraform init

    - docker_terraform_with_openstack apply

    dependencies:
@@ -123,13 +127,13 @@ apply: 
    tags:

        - neutrons-multi-builder



configure-storage:

.configure-storage:

  stage: configure

  extends: .ansible-playbook

  variables:

    PLAYBOOK: "persistent-volume.yaml" 



setup-docker:

.setup-docker:

  stage: post-setup

  extends: .ansible-playbook

  variables:

terraform/main.tf

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ module "drtsans_lfs_runners_green" { 
  flavor                = var.flavor

  image_uuid            = var.image_uuid

  ssh_key_file          = var.ssh_key_file  

  volume_size           = 40

  volume_size           = 41

  ssh_username          = var.user

  network_name          = var.network_name

  runner_tokens         = local.runner_tokens_green

terraform/outputs.tf

+5 −1
Original line number Diff line number Diff line 
output "nodes" {

output "ip_runners_green" {

  value = module.drtsans_lfs_runners_green.ip

}



output "ip_runners_blue" {

  value = module.drtsans_lfs_runners_blue.ip

}