From a580fe9d2baba4f9eb2ffcaeae59c7876f01dda5 Mon Sep 17 00:00:00 2001
From: "Gibbs, Ian" <gibbsib@ornl.gov>
Date: Tue, 13 May 2025 14:20:34 +0000
Subject: [PATCH 1/3] refl1d defaults to refl1d-qa

---
 src/refl1d | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/refl1d b/src/refl1d
index e1867c2..0ab392e 100644
--- a/src/refl1d
+++ b/src/refl1d
@@ -7,7 +7,7 @@ unset SESSION_MANAGER
 COMMAND="refl1d" # --port XXXX
 
 # select the environment to use
-CONDA_ENVIRON=refl1d
+CONDA_ENVIRON=refl1d-qa
 if [ -n "$1" ]; then
   if [ "$1" == "--dev" ]; then
     CONDA_ENVIRON=refl1d-dev
-- 
GitLab


From b1ea05c32bdda0527e7e0d46a98dfcfeb52a3a2c Mon Sep 17 00:00:00 2001
From: "Gibbs, Ian" <gibbsib@ornl.gov>
Date: Tue, 13 May 2025 14:24:07 +0000
Subject: [PATCH 2/3] bump version 1.89

---
 rpm/nsd-app-wrap.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rpm/nsd-app-wrap.spec b/rpm/nsd-app-wrap.spec
index e2c2420..8146de9 100644
--- a/rpm/nsd-app-wrap.spec
+++ b/rpm/nsd-app-wrap.spec
@@ -1,5 +1,5 @@
 Name:           nsd-app-wrap
-Version:        1.88
+Version:        1.89
 Release:        1%{?dist}
 Summary:        Wrapper scripts to launch python applications installed via anaconda
 Vendor:         Peter F. Peterson
@@ -110,6 +110,9 @@ install -m 644 desktop/ibeatles.desktop                %{buildroot}%{_datadir}/a
 
 %changelog
 
+* Tue May 13 2025 Ian Gibbs
+- refl1d points to refl1d-qa
+
 * Fri Apr 11 2025 John Hetrick
 - Removed refred-v4 support
 - Update refl1d command parameters
-- 
GitLab


From 45201b0c626882304e94da24561a2b90fe8b4a7b Mon Sep 17 00:00:00 2001
From: "Gibbs, Ian" <gibbsib@ornl.gov>
Date: Tue, 13 May 2025 14:52:13 +0000
Subject: [PATCH 3/3] remap runner to mantid06.sns.gov

---
 .gitlab-ci.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9c3f267..ecc962f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -39,7 +39,7 @@ stages:
 job_noop:
   stage: 0_noop
   allow_failure: false
-  tags: [ acme-conda-stage.sns.gov ]
+  tags: [ mantid06.sns.gov ]
   script:
     - env | sed -n '/^CI_/p'   | sort
     - env | sed -n '/^FF_/p'   | sort
@@ -51,7 +51,7 @@ job_noop:
 job_readybake_lint:
   stage: 1_setup
   allow_failure: false
-  tags: [ acme-conda-stage.sns.gov ]
+  tags: [ mantid06.sns.gov ]
   script:
     - docker images -a
     - env | grep READYBAKE_ || true
@@ -85,7 +85,7 @@ job_readybake_lint:
 job_readybake_rpmbuild:
   stage: 1_setup
   allow_failure: false
-  tags: [ acme-conda-stage.sns.gov ]
+  tags: [ mantid06.sns.gov ]
   script:
     - docker images -a
     - env | grep READYBAKE_ || true
@@ -117,7 +117,7 @@ job_readybake_rpmbuild:
 job_lint_precommit:
   stage: 2_lint
   allow_failure: true
-  tags: [ acme-conda-stage.sns.gov ]
+  tags: [ mantid06.sns.gov ]
   script:
     - docker images -a
     - |
@@ -137,7 +137,7 @@ job_lint_precommit:
 job_lint_rpmspec:
   stage: 2_lint
   allow_failure: false
-  tags: [ acme-conda-stage.sns.gov ]
+  tags: [ mantid06.sns.gov ]
   script:
     - docker images -a
     - |
@@ -157,7 +157,7 @@ job_lint_rpmspec:
 job_rpmbuild:
   stage: 3_build
   allow_failure: false
-  tags: [ acme-conda-stage.sns.gov ]
+  tags: [ mantid06.sns.gov ]
   script:
     - docker images -a
     - |
@@ -195,7 +195,7 @@ job_rpmbuild:
 job_tag_validate:
   stage: 4_validate
   allow_failure: false
-  tags: [ acme-conda-stage.sns.gov ]
+  tags: [ mantid06.sns.gov ]
   script:
     - docker images -a
     - pwd
@@ -263,7 +263,7 @@ job_tag_validate:
 job_tag_release:
   stage: 5_release
   allow_failure: false
-  tags: [ acme-conda-stage.sns.gov ]
+  tags: [ mantid06.sns.gov ]
   script:
     - docker images -a
     - pwd
@@ -365,7 +365,7 @@ job_tag_release:
 .job_docker_cleanup: &job_docker_cleanup
   stage: 6_cleanup
   allow_failure: false
-  tags: [ acme-conda-stage.sns.gov ]
+  tags: [ mantid06.sns.gov ]
   script:
     - docker images -a
     - docker rmi --force readybake_lint:latest
-- 
GitLab