Skip to content

Commit b3b22c6

Browse files
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
1 parent fd6526a commit b3b22c6

File tree

869 files changed

+42788
-39310
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

869 files changed

+42788
-39310
lines changed

.ci/README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Dockerfile recipes for NISAR
2323
> docker-machine create dev --driver virtualbox
2424
```
2525

26-
This will take a while to run and will build a small VM. Once, you have this - you are ready to start. You can verify that your "dev" instance is running with
26+
This will take a while to run and will build a small VM. Once, you have this - you are ready to start. You can verify that your "dev" instance is running with
2727

2828
```bash
2929
> docker-machine ls
@@ -45,9 +45,9 @@ Every time you login / restart, you will need set appropriate environment variab
4545
> eval "$(docker-machine env dev)"
4646
```
4747

48-
Add this to your modules or a startup script for docker.
48+
Add this to your modules or a startup script for docker.
4949

50-
You can test that docker is properly setup now by testing
50+
You can test that docker is properly setup now by testing
5151

5252
```bash
5353
docker run hello-world
@@ -67,7 +67,7 @@ The following command will build a container tagged "centosbase:v0" from the rec
6767

6868
Confirm that this got created with
6969
```bash
70-
>docker image ls
70+
>docker image ls
7171
```
7272

7373
## How to connect to a container
@@ -87,7 +87,7 @@ After closing the shell, dont forget to clean up the instance that was created f
8787
> docker ps -a
8888
```
8989

90-
2. Remove the instance
90+
2. Remove the instance
9191

9292
```bash
9393
> docker rm idfromprevcmd
@@ -96,7 +96,7 @@ After closing the shell, dont forget to clean up the instance that was created f
9696
## Shutting down docker
9797
------------
9898

99-
To shut down the VM running docker
99+
To shut down the VM running docker
100100

101101
```bash
102102
> docker-machine stop dev

.ci/images/centos/Dockerfile.isce-ops-qa

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ ENV LANG en_US.UTF-8
66
# copy QA repo
77
COPY . /opt/QualityAssurance
88

9-
# Setup test directory
9+
# Setup test directory
1010
RUN set -ex \
1111
&& source /opt/docker/bin/entrypoint_source
12-

.ci/images/centos/Dockerfile.isce-src

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ RUN set -ex \
1818
&& source /home/conda/.rvm/scripts/rvm \
1919
&& sudo /home/conda/.rvm/bin/rvm install 2.3.0 \
2020
&& export PATH=/home/conda/.rvm/gems/ruby-2.3.0/bin:/home/conda/.rvm/gems/ruby-2.3.0@global/wrappers/:$PATH \
21-
&& sudo gem install --no-ri --no-rdoc fpm
21+
&& sudo gem install --no-ri --no-rdoc fpm
2222

2323
# install doxygen and sphinx for doc generation;
2424
# install valgrind for memory leak check

.ci/images/centos/Dockerfile.profile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@ ENV LANG en_US.UTF-8
66
# copy WorkflowProfile repo
77
COPY . /opt/WorkflowProfile
88

9-
# Setup test directory
9+
# Setup test directory
1010
RUN set -ex \
1111
&& source /opt/docker/bin/entrypoint_source \
1212
&& mkdir /home/conda/test \
13-
&& cd /home/conda/test
14-
13+
&& cd /home/conda/test

.ci/images/centos/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,4 +73,3 @@ or
7373
```
7474
docker run -u $ID:$(id -g) nisar/isce-ops:<tag>
7575
```
76-

.ci/images/centos/build-all.sh

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,20 +38,18 @@ echo WFPROFILE: $WFPROFILE
3838
pushd ${ISCE}/.ci/images/centos
3939
if [ -n "${GCCTAR+set}" ]; then
4040
cp ${GCCTAR} . # needed by build-dev.sh
41-
fi
41+
fi
4242
./build-base.sh ${TAG}
4343
./build-dev.sh ${TAG}
44-
./build-isce-src.sh ${TAG} ${ISCE}
44+
./build-isce-src.sh ${TAG} ${ISCE}
4545
./build-isce-ops.sh ${TAG} ${ISCE}
4646

4747
# build ISCE3 image including QA software
48-
if [ -n "${QA+set}" ]; then
48+
if [ -n "${QA+set}" ]; then
4949
./build-isce-ops-qa.sh ${TAG} ${ISCE} ${QA}
5050
fi
5151

5252
# build workflow profile software in image
5353
if [ -n "${WFPROFILE+set}" ]; then
5454
./build-profile.sh ${TAG} ${ISCE} ${WFPROFILE}
5555
fi
56-
57-

.ci/images/centos/run-profile.sh

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ docker run \
2424
--mount type=bind,source=${DATA},target=${CONTAINER_DATADIR} \
2525
--name ${CONTAINERTAG} ${IMAGE}:${TAG} \
2626
/bin/bash -c "source /opt/docker/bin/entrypoint_source &&
27-
echo ${CONTAINER_DATADIR}: &&
28-
ls -al ${CONTAINER_DATADIR} &&
29-
cd ${CONTAINER_TESTDIR} &&
27+
echo ${CONTAINER_DATADIR}: &&
28+
ls -al ${CONTAINER_DATADIR} &&
29+
cd ${CONTAINER_TESTDIR} &&
3030
python3 /opt/WorkflowProfile/WorkflowProfile/workflowprofile.py $CONTAINER_DATADIR/profile_runs.yaml &&
3131
mv profile_interferogram_*.yaml results.pickle profile_runs"
3232

@@ -36,5 +36,3 @@ docker cp ${CONTAINERTAG}:/home/conda/test/profile_runs .
3636

3737
###Delete the container
3838
docker rm ${CONTAINERTAG}
39-
40-

.ci/images/centos/run-qa.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ DATA=$4 # must be inside DATADIR directory
1313
IMAGE=nisar/isce-ops-qa
1414

1515
CONTAINERTAG=qa-${TAG}
16-
CONTAINER_DATADIR=/home/conda/data
16+
CONTAINER_DATADIR=/home/conda/data
1717

1818
echo "IMAGE is $IMAGE"
1919
echo "IMAGE TAG is $TAG"

.ci/jenkins/build-test-deploy/Jenkinsfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ pipeline {
2727
agent any
2828
steps {
2929
//checkout ([
30-
// $class: 'GitSCM',
31-
// branches: [[name: '*/develop']],
32-
// doGenerateSubmoduleConfigurations: false,
33-
// extensions: [[$class: 'WipeWorkspace']],
34-
// submoduleCfg: [],
30+
// $class: 'GitSCM',
31+
// branches: [[name: '*/develop']],
32+
// doGenerateSubmoduleConfigurations: false,
33+
// extensions: [[$class: 'WipeWorkspace']],
34+
// submoduleCfg: [],
3535
// userRemoteConfigs: [[url: '[email protected]:isce-3/isce.git']]
3636
//])
3737

@@ -49,7 +49,7 @@ pipeline {
4949
}
5050
}
5151
}
52-
}
52+
}
5353
post {
5454
always {
5555
echo "Cleaning up workspace"

.ci/jenkins/workflow-mintests/Jenkinsfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ pipeline {
130130
}
131131
unstable {
132132
echo 'I am unstable :/ Emailing PR author and one of the ISCE3 maintainers.'
133-
emailStatus()
133+
emailStatus()
134134
}
135135
failure {
136136
echo 'I failed :( Emailing PR author and one of the ISCE3 maintainers.'
@@ -145,11 +145,10 @@ pipeline {
145145
def emailStatus() {
146146
mail to: '[email protected]',
147147
subject: "ISCE3 build ${currentBuild.result}: ${currentBuild.fullDisplayName}",
148-
body: "Minimum workflow test ${currentBuild.result}: ${env.BUILD_URL}"
148+
body: "Minimum workflow test ${currentBuild.result}: ${env.BUILD_URL}"
149149
emailext(
150150
subject: "ISCE3 build ${currentBuild.result}: ${currentBuild.fullDisplayName}",
151151
body: "Minimum workflow test ${currentBuild.result}: ${env.BUILD_URL}",
152152
recipientProviders: [[$class: 'DevelopersRecipientProvider']]
153153
)
154154
}
155-

0 commit comments

Comments
 (0)