Commit dcd88422 authored by Spencer Kiy's avatar Spencer Kiy 🥑

make changes requested by Suresh

parent 3f03c0e6
#Deployment only test yml file
stages:
- test
- deploy
......@@ -23,33 +21,31 @@ test_acc:
tags:
- docker-runner
before_script:
- echo "-- $CI_ENVIRONMENT_NAME test --"
- echo "-- running XML tests --"
script:
- apk update
- apk add python3 libxml2-dev libxslt-dev python3-dev libc-dev gcc
- apk add python3 libxml2-dev libxslt-dev python3-dev libc-dev gcc git
- export ACCDIR=$(pwd)
- python3 -m venv /env
- /env/bin/pip3 install --upgrade pip
- /env/bin/pip3 install lxml configparser
- /env/bin/python3 xml_validation.py
- /env/bin/pip3 install lxml configparser git+https://gitlab.triumf.ca/hla/acc-utilities/accpy.git@v0.0.1#egg=accpy
- /env/bin/python3 -m accpy.xml_validation
after_script:
- echo "-- finished $CI_ENVIRONMENT_NAME test --"
- echo "-- finished running XML tests --"
except:
- myrrha-oshelb
devel:
stage: deploy
script:
- rm -Rf $PROJECT_DEPLOY_DIR/*
- cp -R * $PROJECT_DEPLOY_DIR
- ln -snf /etc/uwsgi.d/templates/beam.ini /etc/uwsgi.d/$CI_ENVIRONMENT_NAME/beam.ini
- curl --request POST --form "token=$CI_JOB_TOKEN" --form ref=master https://gitlab.triumf.ca/api/v4/projects/93/trigger/pipeline
- curl --request POST --form "token=$CI_JOB_TOKEN" --form ref=beta https://gitlab.triumf.ca/api/v4/projects/93/trigger/pipeline
environment:
name: devel
url: https://hla.triumf.ca/devel
url: https://devel.hla.triumf.ca
only:
- master
- devel
# staging:
# stage: deploy
......@@ -59,7 +55,7 @@ devel:
# - ln -snf /etc/uwsgi.d/templates/beam.ini /etc/uwsgi.d/$CI_ENVIRONMENT_NAME/beam.ini
# environment:
# name: staging
# url: https://hla.triumf.ca/staging
# url: https://staging.hla.triumf.ca
# only:
# - staging
......@@ -71,18 +67,13 @@ beta:
- ln -snf /etc/uwsgi.d/templates/beam.ini /etc/uwsgi.d/$CI_ENVIRONMENT_NAME/beam.ini
environment:
name: beta
url: https://hla.triumf.ca/beta
url: https://beta.hla.triumf.ca
only:
- beta
prod:
master:
stage: deploy
script:
- rm -Rf $PROJECT_DEPLOY_DIR/*
- cp -R * $PROJECT_DEPLOY_DIR
- ln -snf /etc/uwsgi.d/templates/beam.ini /etc/uwsgi.d/$CI_ENVIRONMENT_NAME/beam.ini
environment:
name: prod
url: https://hla.triumf.ca
- curl --request POST --form "token=$CI_JOB_TOKEN" --form ref=beta https://gitlab.triumf.ca/api/v4/projects/93/trigger/pipeline
only:
- prod
- master
\ No newline at end of file
......@@ -164,8 +164,8 @@
<element id="AHRS:MB7A" type="mb" s="3824.361*mm" l="1884.956*mm">
<epics>
<setpoint pv="AHRS:MB7A:CUR" unit="A" type="current" min="0.0" max="200.0"/>
<setpoint pv="AHRS:HALLMB7A:RDFIELD" type="Bfield" rw="RO" unit="G" min="-5000.0" max="0.0"/>
<readback pv="AHRS:MB7A:RDCUR" unit="A" type="current"/>
<readback pv="AHRS:HALLMB7A:RDFIELD" unit="G"/>
</epics>
<optr theta="90*deg" entrEdge="26.5651*deg" exitEdge="26.5651*deg" fieldIndex="0" k1="0.2442" k2="4.000" edgeCurv="0.0/cm" fullGap="70*mm"/>
</element>
......@@ -178,8 +178,8 @@
<element id="AHRS:MB7B" type="mb" s="7310.076*mm" l="1884.956*mm">
<epics>
<setpoint pv="AHRS:MB7B:CUR" unit="A" type="current" min="0.0" max="200.0"/>
<setpoint pv="AHRS:HALLMB7B:RDFIELD" type="Bfield" rw="RO" unit="G" min="-5000.0" max="0.0"/>
<readback pv="AHRS:MB7B:RDCUR" unit="A" type="current"/>
<readback pv="AHRS:HALLMB7B:RDFIELD" unit="G"/>
</epics>
<optr theta="90*deg" entrEdge="26.565*deg" exitEdge="26.565*deg" fieldIndex="0" k1="0.244" k2="4.000" edgeCurv="0.0/cm" fullGap="70*mm"/>
</element>
......
......@@ -2,8 +2,8 @@
<notes>Initial values provided by Suresh</notes>
<set pv="ATIS:BIAS:VOL" value="30000*V"/>
<set pv="ATIS:EE:VOL" value="82*V"/>
<set pv="ALTIS:Q1:NEG:BIASVOL" value="0*V"/>
<set pv="ALTIS:Q1:POS:BIASVOL" value="0*V"/>
<set pv="ALTIS:Q1:NEG:BIASVOL" value="0*V" tuneable="True"/>
<set pv="ALTIS:Q1:POS:BIASVOL" value="0*V" tuneable="True"/>
<set pv="ALTIS:Q1:VOL" value="1285*V"/>
<set pv="ALTIS:Q2:VOL" value="1589*V"/>
<set pv="ALTIS:Q3:VOL" value="821*V"/>
......
......@@ -5,8 +5,8 @@
</notes>
<set pv="ATIS:BIAS:VOL" value="30000*V"/>
<set pv="ATIS:EE:VOL" value="52*V"/>
<set pv="ALTIS:Q1:NEG:BIASVOL" value="-60*V"/>
<set pv="ALTIS:Q1:POS:BIASVOL" value="-100*V"/>
<set pv="ALTIS:Q1:NEG:BIASVOL" value="0*V" tuneable="True"/>
<set pv="ALTIS:Q1:POS:BIASVOL" value="0*V" tuneable="True"/>
<set pv="ALTIS:Q1:VOL" value="805*V"/>
<set pv="ALTIS:Q2:VOL" value="1558*V"/>
<set pv="ALTIS:Q3:VOL" value="1432*V"/>
......
......@@ -6,8 +6,8 @@
<set pv="AHRS:Q5:VOL" value="1427*V"/>
<set pv="AHRS:Q6:VOL" value="3557*V"/>
<set pv="AHRS:Q7:VOL" value="0*V"/>
<set pv="AHRS:MB7A:FLD:SETP" value="2395.715*G"/>
<set pv="AHRS:MB7B:FLD:SETP" value="2395.715*G"/>
<set pv="AHRS:HALLMB7A:RDFIELD" value="-2395.715*G"/>
<set pv="AHRS:HALLMB7B:RDFIELD" value="-2395.715*G"/>
<set pv="AHRS:Q8:VOL" value="0*V"/>
<set pv="AHRS:Q9:VOL" value="3557*V"/>
<set pv="AHRS:Q10:VOL" value="1427*V"/>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment